deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-12 21:37:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixing again the merge conflict showing up in one topic

Browse Source
This commit is contained in:
Celeste de Guzman 2017-07-31 15:20:44 -07:00
parent 56a5cf4e1a
commit 7669cf9f76
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
education/windows/change-history-edu.md
View File

@ -8,7 +8,7 @@ ms.sitesec: library
ms.pagetype: edu ms.pagetype: edu
author: CelesteDG author: CelesteDG
ms.author: celested ms.author: celested
ms.date: 07/10/2017 ms.date: 08/01/2017
--- ---
# Change history for Windows 10 for Education # Change history for Windows 10 for Education

4
education/windows/configure-windows-for-education.md
View File

@ -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 keywords: Windows 10 deployment, recommendations, privacy settings, school, education, configurations, accessibility, assistive technology
ms.mktglfcycl: plan ms.mktglfcycl: plan
ms.sitesec: library ms.sitesec: library
<<<<<<< HEAD
ms.prod: w10 ms.prod: w10
ms.pagetype: edu ms.pagetype: edu
localizationpriority: high
=======
ms.localizationpriority: high ms.localizationpriority: high
>>>>>>> d1b83b5f3a3985aa9aceb46a1b28df00986a7061
author: CelesteDG author: CelesteDG
ms.author: celested ms.author: celested
ms.date: 06/19/2017 ms.date: 06/19/2017