init

kinaWoo · Oct 10, 2017 · b2db682 · b2db682
1 parent 3bcbc88
commit b2db682
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -1,15 +1,6 @@
-<<<<<<< HEAD
-# dynamicrouter
 
-> A Vue.js project
-
-## Build Setup
-
-``` bash
-=======
 # dynamicRouter
 vue-router动态路由
->>>>>>> e48f539304ee53ab4330b848953c44fe5749970f
 # install dependencies
 npm install
 
@@ -18,18 +9,3 @@ npm run dev
 
 # build for production with minification
 npm run build
-<<<<<<< HEAD
-
-# build for production and view the bundle analyzer report
-npm run build --report
-
-# run e2e tests
-npm run e2e
-
-# run all tests
-npm test
-```
-
-For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
-=======
->>>>>>> e48f539304ee53ab4330b848953c44fe5749970f