From e798f98e366defd8df3a4cdacc0dd6ae48b2356d Mon Sep 17 00:00:00 2001
From: Maricia Alforque <maricia@microsoft.com>
Date: Mon, 30 Jul 2018 21:31:20 +0000
Subject: [PATCH] Merged PR 10202: Fixed formatting issue in Policy CSP -
 Experience topic

---
 windows/client-management/mdm/policy-csp-experience.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/windows/client-management/mdm/policy-csp-experience.md b/windows/client-management/mdm/policy-csp-experience.md
index 47b5293f9e..55a43ec5ac 100644
--- a/windows/client-management/mdm/policy-csp-experience.md
+++ b/windows/client-management/mdm/policy-csp-experience.md
@@ -1545,7 +1545,10 @@ Microsoft Edge on your PC:
 
 <!--/Validation-->
 <!--/Policy-->
+<<<<<<< HEAD
+=======
 
+>>>>>>> 3c06afe9875ad82fff960313bea663f49a2f7d2c
 <hr/>
 
 Footnote: