fix(Conflicts): Fixed conflicts

takenet · May 30, 2018 · 3458939 · 3458939
2 parents a7e9a5e + 9564edf
commit 3458939
Show file tree

Hide file tree

Showing 9 changed files with 603 additions and 199 deletions.
diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
@@ -12,7 +12,7 @@ module.exports = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: "index.html",
       pkg: require("../package.json"),
-      template: "./src/index.html",
+      template: "./docs/index.html",
       inject: "body"
     })
   ]