@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# 4dagehome
> A Vue.js project
@@ -29,8 +28,3 @@ 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).
-=======
-# Front_End_CN
-
-中文版
->>>>>>> d8ce72ed2fc51ff59730f7e59821419092fecb06
