merge conflict

This commit is contained in:
Patti Short
2018-08-14 13:40:55 -07:00
47 changed files with 6543 additions and 5578 deletions

View File

@ -16,6 +16,7 @@
For more details about configuring the browser syncing options, see [Sync browser settings options](../group-policies/sync-browser-settings-gp.md).
### ADMX info and settings
#### ADMX info
- **GP English name:** Do not sync browser settings