add merge config

jrmoreno1 · Mar 21, 2017 · 4e0ea6c · 4e0ea6c
1 parent 27cd8b8
commit 4e0ea6c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -212,10 +212,12 @@ _site/
 api_src/
 api/
 _themes/
+_themes.pdf/
 log/
 .optemp/
 .openpublishing.buildcore.ps1
 # Spelling add-on file for VS Code.
 spell.json
 samples/framework/docker/MVCRandomAnswerGenerator/containerImage
-.DS_Store
+.DS_Store
+_dependentPackages/
diff --git a/docfx.json b/docfx.json
@@ -1,4 +1,15 @@
 {
+  "merge": {
+    "content": [
+      {
+        "files": [
+          "api/**/*.yml"
+        ]
+      }
+    ],
+    "dest": ".",
+    "tocMetadata": "version"
+  },
   "build": {
     "content": [
       {