From 0c269cf6efb3aaaa4f0e53325150b37decf6daa5 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Mon, 16 Oct 2017 22:42:42 +0000 Subject: [PATCH] Merged PR 3841: fix conflicts fix conflicts --- windows/deployment/change-history-for-deploy-windows-10.md | 2 +- windows/whats-new/get-started-with-1709.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/windows/deployment/change-history-for-deploy-windows-10.md b/windows/deployment/change-history-for-deploy-windows-10.md index 593e2b2549..3715ff0188 100644 --- a/windows/deployment/change-history-for-deploy-windows-10.md +++ b/windows/deployment/change-history-for-deploy-windows-10.md @@ -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 diff --git a/windows/whats-new/get-started-with-1709.md b/windows/whats-new/get-started-with-1709.md index c54dd31888..43468d37f4 100644 --- a/windows/whats-new/get-started-with-1709.md +++ b/windows/whats-new/get-started-with-1709.md @@ -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