测试提交

2021-08-09 18:27:36 +08:00 · 2021-08-09 18:27:36 +08:00 · 942099478d
parent 819ec095a6
commit 942099478d
1 changed files with 1 additions and 4 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -1,11 +1,8 @@
 <template>
  <div id="app">
-<<<<<<< HEAD
    <el-button type="success">成功</el-button>
-    <hello-world></hello-world>
-=======
    <el-button type="success">成功按钮111</el-button>
->>>>>>> 497212fe5a5e7e56b87cff7e44a9a2f9e6ff8857
+    <hello-world></hello-world>
  </div>
 </template>