From 2a5e4c8b95f5a9fac586fcd1658ac104627ce278 Mon Sep 17 00:00:00 2001
From: Patti Short <patti.short@microsoft.com>
Date: Tue, 31 Jul 2018 14:57:15 -0700
Subject: [PATCH] forgot to save the file

---
 ...igure-browser-telemetry-for-m365-analytics-include.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/browsers/edge/includes/configure-browser-telemetry-for-m365-analytics-include.md b/browsers/edge/includes/configure-browser-telemetry-for-m365-analytics-include.md
index 7c15e1d8c8..80f3fa463d 100644
--- a/browsers/edge/includes/configure-browser-telemetry-for-m365-analytics-include.md
+++ b/browsers/edge/includes/configure-browser-telemetry-for-m365-analytics-include.md
@@ -19,20 +19,11 @@
 |Enabled |3 |3 |Send both intranet and Internet history | |
 ---
 
-<<<<<<< HEAD
 >>You can find this policy and the related policies in the following location of the Group Policy Editor:
 >> 
 >>**_Computer Configuration\\Administrative Templates\\Windows Components\\Data Collection and Preview Builds\\_**
 >><ul><li>Allow Telemetry = Enabled, _Enhanced_</li><li>Configure the Commercial ID = String of the Commercial ID</li><li>Configure collection of browsing data for Microsoft 365 Analytics</li></ul> 
 
-=======
->>You can find this setting in the following location of the Group Policy Editor:
->> 
->>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**_Computer Configuration\\Administrative Templates\\Windows Components\\Data Collection and Preview Builds\\_**
-
->[!IMPORTANT]
->For this policy to work, enable the Allow Telemetry policy with the _Enhanced_ option and enable the Configure the Commercial ID policy by providing the Commercial ID.
->>>>>>> d9ed64c05b90318b610f2f9214605443099f9927
 
 
 ### ADMX info and settings