deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-15 10:23:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into rs1

Browse Source 
# Conflicts:
#	windows/plan/TOC.md
This commit is contained in:
jdeckerMS
2016-07-22 08:07:25 -07:00
parent 00dbbc24bb
commit 939167e152
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
windows/plan/TOC.md
View File

@ -37,9 +37,5 @@
##### [Testing Your Application Mitigation Packages](testing-your-application-mitigation-packages.md)
#### [Using the Sdbinst.exe Command-Line Tool](using-the-sdbinstexe-command-line-tool.md)
### [Compatibility Fixes for Windows 10, Windows 8, Windows 7, and Windows Vista](compatibility-fixes-for-windows-8-windows-7-and-windows-vista.md)
<<<<<<< HEAD
## [Change history for Plan for Windows 10 deployment](change-history-for-plan-for-windows-10-deployment.md)
=======
>>>>>>> refs/remotes/origin/master