diff --git a/src/App.vue b/src/App.vue
index ed2255b..74fb87f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,23 +1,18 @@
 <template>
   <div id="app">
-<<<<<<< HEAD
-    <el-button type="success">成功</el-button>
-    <hello-world></hello-world>
-=======
-    <el-button type="success">成功按钮111</el-button>
->>>>>>> 497212fe5a5e7e56b87cff7e44a9a2f9e6ff8857
+    <el-button type="success">成功按钮111222333</el-button>
   </div>
 </template>
 
 <script>
-import HelloWorld from '@/components/HelloWorld.vue'
+import HelloWorld from "@/components/HelloWorld.vue";
 
 export default {
-  name: 'Home',
+  name: "Home",
   components: {
-    HelloWorld
-  }
-}
+    HelloWorld,
+  },
+};
 </script>
 
 <style>