LizRoss 4ea607e2a7 Fixing merge conflicts

2016-07-28 14:32:38 -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

edu loc tags

2016-07-28 12:37:15 -07:00

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

edu loc tags

2016-07-28 12:37:15 -07:00

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

edu loc tags

2016-07-28 12:37:15 -07:00

edu-deployment-recommendations.md

edu loc tags

2016-07-28 12:37:15 -07:00

get-minecraft-for-education.md

edu loc tags

2016-07-28 12:37:15 -07:00

index.md

edu loc tags

2016-07-28 12:37:15 -07:00

school-get-minecraft.md

edu loc tags

2016-07-28 12:37:15 -07:00

set-up-school-pcs-technical.md

edu loc tags

2016-07-28 12:37:15 -07:00

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

edu loc tags

2016-07-28 12:37:15 -07:00

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

edu loc tags

2016-07-28 12:37:15 -07:00

set-up-windows-10.md

edu loc tags

2016-07-28 12:37:15 -07:00

take-a-test-app-technical.md

edu loc tags

2016-07-28 12:37:15 -07:00

take-a-test-multiple-pcs.md

edu loc tags

2016-07-28 12:37:15 -07:00

take-a-test-single-pc.md

edu loc tags

2016-07-28 12:37:15 -07:00

take-tests-in-windows-10.md

edu loc tags

2016-07-28 12:37:15 -07:00

teacher-get-minecraft.md

edu loc tags

2016-07-28 12:37:15 -07:00

TOC.md

resolve merge conflicts

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

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

edu loc tags

2016-07-28 12:37:15 -07:00

windows-editions-for-education-customers.md

Fixing merge conflicts

2016-07-28 14:32:38 -07:00