chore: 清楚合并冲突

front-end-open · Aug 22, 2020 · 03a6284 · 03a6284
1 parent 75937f7
commit 03a6284
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/views/main/setting/index.vue b/src/views/main/setting/index.vue
@@ -234,9 +234,6 @@ export default {
       test: 'helllosdfasfasd',
     }
   },
-<<<<<<< HEAD
-  created() {},
-=======
   created() {
     axios
       .post('http://121.40.30.117:5000/server/addsetting', {
@@ -252,7 +249,6 @@ export default {
         console.log(error)
       })
   },
->>>>>>> refactor(setting): 用户配置同步服务器
   methods: {
     //点击浏览按钮 将input的value值替换为文件夹路径
     files(num) {