Merged PR 3841: fix conflicts

fix conflicts
This commit is contained in:
Greg Lindsay
2017-10-16 22:42:42 +00:00
parent b61c1d0ff5
commit 0c269cf6ef
2 changed files with 1 additions and 5 deletions

View File

@ -6,7 +6,7 @@ ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
author: greg-lindsay
ms.date: 06/28/2017
ms.date: 10/17/2017
---
# Change history for Deploy Windows 10

View File

@ -27,11 +27,7 @@ Before you install any version of Windows 10, make sure you visit the [Windows 1
## What's new in Windows 10, version 1709 IT Pro content
<<<<<<< HEAD
Take a look at the [What's new in Windows 10, version 1709 IT Pro content](whats-new-windows-10-version-1709), for the latest updates in content. Use this topic to easily navigate the documentation for the new features in Windows 10, version 1709.
=======
Take a look at the [What's new in Windows 10, version 1709 IT Pro content](whats-new-windows-10-version-1709.md), for the latest updates in content. Use this topic to easily navigate the documentation for the new features in Windows 10, version 1709.
>>>>>>> master
## Windows 10 release information and update history