git is difficult

frontend/src/views/Login.vue

@@ -86,19 +86,11 @@ onMounted(() => {});
           ></v-text-field>
 
           <p class="text-center">
-<<<<<<< HEAD
             還沒有帳號？
             <router-link to="/signup">註冊</router-link> / <router-link
               to="/recover-password"
               >忘記密碼</router-link
             >
-=======
-            {{ t("haventAccount") }}
-            <router-link to="/signup">{{ t("register") }}</router-link
-            > / <router-link to="/recover-password">{{
-              t("forgotPsd")
-            }}</router-link>
->>>>>>> choozmo/front-dev
           </p>
 
           <v-btn
@@ -113,8 +105,4 @@ onMounted(() => {});
       </v-col>
     </v-row>
   </v-container>
-<<<<<<< HEAD
-
-=======
->>>>>>> choozmo/front-dev
 </template>