jdeckerMS 66c0c1044b resolve merge conflicts ...

# Conflicts:
#	education/windows/TOC.md
#	education/windows/index.md

2016-07-27 12:43:27 -07:00

..

images

resolve merge conflicts

2016-07-27 12:43:27 -07:00

change-history-edu.md

resolve merge conflicts

2016-07-27 12:43:27 -07:00

chromebook-migration-guide.md

fix tagging

2016-06-07 12:00:17 -07:00

deploy-windows-10-in-a-school-district.md

spacing

2016-07-27 11:04:38 -07:00

deploy-windows-10-in-a-school.md

fix tagging

2016-06-07 12:00:17 -07:00

edu-deployment-recommendations.md

added missing # to fix broken link

2016-07-21 15:35:25 -07:00

get-minecraft-for-education.md

updates for troubleshooting and private store apps

2016-06-08 15:39:33 -07:00

index.md

resolve merge conflicts

2016-07-27 12:43:27 -07:00

school-get-minecraft.md

updates to staged topics

2016-06-08 15:29:15 -07:00

set-up-school-pcs-technical.md

fix headings

2016-07-15 14:01:07 -07:00

set-up-students-pcs-to-join-domain.md

un-en-us'd links

2016-07-21 11:55:40 -07:00

set-up-students-pcs-with-apps.md

un-en-us'd links

2016-07-21 11:55:40 -07:00

set-up-windows-10.md

remove "preview" tag from topics

2016-07-12 09:22:56 -07:00

take-a-test-app-technical.md

remove "preview" tag from topics

2016-07-12 09:22:56 -07:00

take-a-test-multiple-pcs.md

remove "preview" tag from topics

2016-07-12 09:22:56 -07:00

take-a-test-single-pc.md

remove "preview" tag from topics

2016-07-12 09:22:56 -07:00

take-tests-in-windows-10.md

remove "preview" tag from topics

2016-07-12 09:22:56 -07:00

teacher-get-minecraft.md

fixing typo

2016-06-15 06:43:08 -07:00

TOC.md

resolve merge conflicts

2016-07-27 12:43:27 -07:00

use-set-up-school-pcs-app.md

remove "preview" tag from topics

2016-07-12 09:22:56 -07:00

windows-editions-for-education-customers.md

fix links in edu

2016-07-27 08:20:31 -07:00