troubleshooting a PR conflict

This commit is contained in:
Patti Short
2018-08-02 14:20:40 -07:00
parent dcf50cc66c
commit 4e4bf347cb
2 changed files with 27 additions and 26 deletions

View File

@ -1,39 +1,39 @@
#[Microsoft Edge deployment for IT Pros](index.yml)
# [Microsoft Edge deployment for IT Pros](index.yml)
##[(Preview) New Microsoft Edge Group Policies and MDM settings](new-policies.md)
## [(Preview) New Microsoft Edge Group Policies and MDM settings](new-policies.md)
##[(Preview) Deploy Microsoft Edge kiosk mode](microsoft-edge-kiosk-mode-deploy.md)
## [(Preview) Deploy Microsoft Edge kiosk mode](microsoft-edge-kiosk-mode-deploy.md)
##[Group policies & configuration options](group-policies/index.yml)
###[All group policies](available-policies.md)
###[Address bar settings](group-policies/address-bar-settings-gp.md)
###[Adobe settings](group-policies/adobe-settings-gp.md)
###[Books Library management](group-policies/books-library-management-gp.md)
###[Browser settings management](group-policies/browser-settings-management-gp.md)
###[Developer settings](group-policies/developer-settings-gp.md)
###[Extensions management](group-policies/extensions-management-gp.md)
###[Favorites management](group-policies/favorites-management-gp.md)
###[Home button settings](group-policies/home-button-gp.md)
###[Interoperability and enterprise guidance](group-policies/interoperability-enterprise-guidance-gp.md)
###[New tab page settings](group-policies/new-tab-page-settings-gp.md)
###[Prelaunch Microsoft Edge and preload tabs](group-policies/prelaunch-preload-gp.md)
###[Search engine customization](group-policies/search-engine-customization-gp.md)
###[Security and privacy management](group-policies/security-privacy-management-gp.md)
###[Start pages settings](group-policies/start-pages-gp.md)
###[Sync browser settings](group-policies/sync-browser-settings-gp.md)
###[Telemetry and data collection](group-policies/telemetry-management-gp.md)
## [Group policies & configuration options](group-policies/index.yml)
### [All group policies](available-policies.md)
### [Address bar settings](group-policies/address-bar-settings-gp.md)
### [Adobe settings](group-policies/adobe-settings-gp.md)
### [Books Library management](group-policies/books-library-management-gp.md)
### [Browser settings management](group-policies/browser-settings-management-gp.md)
### [Developer settings](group-policies/developer-settings-gp.md)
### [Extensions management](group-policies/extensions-management-gp.md)
### [Favorites management](group-policies/favorites-management-gp.md)
### [Home button settings](group-policies/home-button-gp.md)
### [Interoperability and enterprise guidance](group-policies/interoperability-enterprise-guidance-gp.md)
### [New tab page settings](group-policies/new-tab-page-settings-gp.md)
### [Prelaunch Microsoft Edge and preload tabs](group-policies/prelaunch-preload-gp.md)
### [Search engine customization](group-policies/search-engine-customization-gp.md)
### [Security and privacy management](group-policies/security-privacy-management-gp.md)
### [Start pages settings](group-policies/start-pages-gp.md)
### [Sync browser settings](group-policies/sync-browser-settings-gp.md)
### [Telemetry and data collection](group-policies/telemetry-management-gp.md)
##[Change history for Microsoft Edge](change-history-for-microsoft-edge.md)
## [Change history for Microsoft Edge](change-history-for-microsoft-edge.md)
##[System requirements](about-microsoft-edge.md#minimum-system-requirements)
## [System requirements](about-microsoft-edge.md#minimum-system-requirements)
##[Supported languages](about-microsoft-edge.md#supported-languages)
## [Supported languages](about-microsoft-edge.md#supported-languages)
##[Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md)
## [Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md)
##[Microsoft Edge Frequently Asked Questions (FAQs)](microsoft-edge-faq.md)
## [Microsoft Edge Frequently Asked Questions (FAQs)](microsoft-edge-faq.md)

1
browsers/edge/index.md Normal file
View File

@ -0,0 +1 @@
# index