1

Signed-off-by: zdy1988 <[email protected]>
shakahl · Aug 18, 2017 · 22d30c3 · 22d30c3
1 parent fbec725
commit 22d30c3
Showing 1 changed file with 0 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,22 +1,3 @@
 # vue-tree
-<<<<<<< HEAD
 
 > a tree plugin for vue2
-
-## Build Setup
-
-``` bash
-# install dependencies
-npm install
-
-# serve with hot reload at localhost:8080
-npm run dev
-
-# build for production with minification
-npm run build
-```
-
-For detailed explanation on how things work, consult the [docs for vue-loader](http://vuejs.github.io/vue-loader).
-=======
-A Tree Plugin For Vue2
->>>>>>> c2debfae630589ca58b643d69122437ea659b501