fixing conflict

This commit is contained in:
LizRoss 2017-02-09 10:18:37 -08:00
commit dc535c671a

View File

@ -19,6 +19,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
| New or changed topic | Description | | New or changed topic | Description |
| --- | --- | | --- | --- |
| [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) | Added Group Policy setting that blocks user access to Windows Update. | | [Assign devices to servicing branches for Windows 10 updates](waas-servicing-branches-windows-10-updates.md) | Added Group Policy setting that blocks user access to Windows Update. |
| [Distribute offline apps](distribute-offline-apps.md) | General updates to topic. Added links to supporting content for System Center Configuration Manager and Microsoft Intune. |
|[Test scenario 6 - Review a reminder suggested by Cortana based on what youve promised in email](cortana-at-work-scenario-6.md) |New | |[Test scenario 6 - Review a reminder suggested by Cortana based on what youve promised in email](cortana-at-work-scenario-6.md) |New |
## January 2017 ## January 2017