conflict fixed

This commit is contained in:
Patti Short
2018-08-07 09:50:19 -07:00
5 changed files with 13 additions and 4 deletions

View File

@ -27,7 +27,11 @@ For more details about configuring the browser syncing options, see [Sync browse
- **GP ADMX file name:** SettingSync.admx
#### MDM settings
<<<<<<< HEAD
- **MDM name:** [Experience/DoNotSyncBrowserSettings](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-donotsyncbrowsersetting)
=======
- **MDM name:** [Experience/DoNotSyncBrowserSettings](../available-policies.md#do-not-sync-browser-settings)
>>>>>>> 5fa3b7b039c599d82dd9013a4b2092f20578f503
- **Supported devices:** Desktop
- **URI full path:** ./Vendor/MSFT/Policy/Config/Experience/DoNotSyncBrowserSettings
- **Data type:** Integer
@ -48,4 +52,4 @@ For more details about configuring the browser syncing options, see [Sync browse
[About sync setting on Microsoft Edge on Windows 10 devices](http://windows.microsoft.com/windows-10/about-sync-settings-on-windows-10-devices)
<p><p>
<hr>
<hr>