From d5ca6efef5393bd85f78edad739d0a277cb4d6de Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 19 Jan 2017 09:40:43 -0800 Subject: [PATCH 1/2] remove >HEAD --- .../manage/change-history-for-manage-and-update-windows-10.md | 1 - 1 file changed, 1 deletion(-) diff --git a/windows/manage/change-history-for-manage-and-update-windows-10.md b/windows/manage/change-history-for-manage-and-update-windows-10.md index 89487d41ca..26af07a521 100644 --- a/windows/manage/change-history-for-manage-and-update-windows-10.md +++ b/windows/manage/change-history-for-manage-and-update-windows-10.md @@ -15,7 +15,6 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in >If you're looking for **update history** for Windows 10, see [Windows 10 and Windows Server 2016 update history](https://support.microsoft.com/help/12387/windows-10-update-history). ## January 2017 -<<<<<<< HEAD | New or changed topic | Description | | --- | --- | From 50dd9c5724df30a170154e4341a1c4263aac3d55 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Thu, 19 Jan 2017 09:55:55 -0800 Subject: [PATCH 2/2] adding HoloLens to list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fa13a55593..8864d2a10e 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Welcome! This repository houses the docs that are written for IT professionals f - [Surface](https://technet.microsoft.com/itpro/surface) - [Surface Hub](https://technet.microsoft.com/itpro/surface-hub) - [Windows 10 for Education](https://technet.microsoft.com/edu/windows) +- [HoloLens](https://technet.microsoft.com/itpro/hololens) - [Microsoft Desktop Optimization Pack](https://technet.microsoft.com/itpro/mdop) ## Contributing