test: xxx

ttk-cli · Jul 28, 2022 · 7d5e0b4 · 7d5e0b4
1 parent b07c132
commit 7d5e0b4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
@@ -26,7 +26,11 @@ function pushRouter(path: string) {
 }
 
 const { name, fullName, updateName } = useStore('test')
+<<<<<<< HEAD
 const { userInfo, setUserInfo } = useStore('user')
+=======
+const { userInfo, setUserInfo } = useStore('user')
+<<<<<<<
 
 const dateVal = ref(new Date())