diff --git a/src/App.vue b/src/App.vue
index a44f5d8..ed2255b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,11 @@
 <template>
   <div id="app">
+<<<<<<< HEAD
     <el-button type="success">成功</el-button>
     <hello-world></hello-world>
+=======
+    <el-button type="success">成功按钮111</el-button>
+>>>>>>> 497212fe5a5e7e56b87cff7e44a9a2f9e6ff8857
   </div>
 </template>