fix merge conflicts with master

horrormyth · Dec 19, 2018 · d6fde79 · d6fde79
2 parents 1c18d7f + 367ed39
commit d6fde79
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -106,15 +106,14 @@ module.exports = {
                     collapsable: false,
                     children: [
                         '/topics/tooling/cli',
-                        '/topics/tooling/testing',
-                        '/topics/tooling/deployment',
                     ],
                 },
                 {
                     title: 'Discussions',
                     collapsable: false,
                     children: [
                         '/topics/discussions/async-vs-sync',
+                        '/topics/discussions/deployment',
                         '/topics/discussions/security',
                     ]
                 }

diff --git a/docs/topics/tooling/deployment.md → docs/topics/discussions/deployment.md b/docs/topics/tooling/deployment.md → docs/topics/discussions/deployment.md
diff --git a/docs/topics/tooling/testing.md b/docs/topics/tooling/testing.md