From 7669cf9f76cd4b9fb88928713d9719372f7305fe Mon Sep 17 00:00:00 2001 From: Celeste de Guzman Date: Mon, 31 Jul 2017 15:20:44 -0700 Subject: [PATCH] fixing again the merge conflict showing up in one topic --- education/windows/change-history-edu.md | 2 +- education/windows/configure-windows-for-education.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/education/windows/change-history-edu.md b/education/windows/change-history-edu.md index 0b035b0d91..0b23f03667 100644 --- a/education/windows/change-history-edu.md +++ b/education/windows/change-history-edu.md @@ -8,7 +8,7 @@ ms.sitesec: library ms.pagetype: edu author: CelesteDG ms.author: celested -ms.date: 07/10/2017 +ms.date: 08/01/2017 --- # Change history for Windows 10 for Education diff --git a/education/windows/configure-windows-for-education.md b/education/windows/configure-windows-for-education.md index 91270564fd..c7c048afcb 100644 --- a/education/windows/configure-windows-for-education.md +++ b/education/windows/configure-windows-for-education.md @@ -4,13 +4,9 @@ description: Provides guidance on ways to configure the OS diagnostic data, cons keywords: Windows 10 deployment, recommendations, privacy settings, school, education, configurations, accessibility, assistive technology ms.mktglfcycl: plan ms.sitesec: library -<<<<<<< HEAD ms.prod: w10 ms.pagetype: edu -localizationpriority: high -======= ms.localizationpriority: high ->>>>>>> d1b83b5f3a3985aa9aceb46a1b28df00986a7061 author: CelesteDG ms.author: celested ms.date: 06/19/2017