Miguel Jacq 408aef3941 Fix conflicts introduced from new changes in master branch		2017-11-01 14:00:00 +11:00
..
uninstalling-windows-tools-2.md
windows-appvms.md
windows-tools-2.md
windows-tools-3.md