merge conflicts with live

mtillman · mtillman · commit d532c31882f0 · 2016-10-06T18:31:43.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,3 @@ _site/
 
 .openpublishing.buildcore.ps1
 _themes
-
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "docs themes for _themes"]
+	path = _themes
+	url = https://github.com/Microsoft/templates.docs.msft
+	branch = master
diff --git a/_themes b/_themes
@@ -0,0 +1 @@
+Subproject commit fa15bb98a6d7eb30ebb3283f2cc85bafebfeea63
diff --git a/sccm/TOC.md b/sccm/TOC.md
@@ -6,4 +6,3 @@
 ## [Operating system deployment guide](osd\understand\introduction-to-operating-system-deployment.md)
 ## [Protect data and infrastructure guide](protect\understand\protect-data-and-site-infrastructure.md)
 ## [Software update management guide](sum\understand\software-updates-introduction.md)
-

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,3 @@ _site/`
`5`	`5`
`6`	`6`	`.openpublishing.buildcore.ps1`
`7`	`7`	`_themes`
`8`		`-`