提交

2023-07-20 19:29:19 +08:00
parent d5c86e2038
commit 43e6f61a0d
3 changed files with 18 additions and 23 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,5 @@
 <template>
-<<<<<<< HEAD
-  <router-view/>
-=======
+
  <router-view />
  <login></login>
 >>>>>>> 542e853 (提交)