From 942099478dc9b622af591eec53a48226c7b0ff03 Mon Sep 17 00:00:00 2001
From: Yuanjianghong <hbzgyjh@126.com>
Date: Mon, 9 Aug 2021 18:27:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ed2255b..a9f7d10 100644
--- 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>