login页冲突

62409892 · sunchao · 3655df5e · 62409892
Commit 62409892 authored Nov 11, 2022 by sunchao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

components/login/login.vue
+0 -5

No files found.
--- a/components/login/login.vue
+++ b/components/login/login.vue
@@ -318,12 +318,7 @@
 				
 			},
 			mounted() {
-<<<<<<< HEAD
 				this.checkToken();
-=======
-				this.checkToken()
-				
->>>>>>> 9e990c8792924f087e76b52a4e61cccfbae779c9
 			}
 		}
 </script>