.

src/views/account/Login.vue

@@ -13,10 +13,6 @@
                     clearable="true"
                     v-model="form.phone"
                     :rules="[
-<<<<<<< HEAD
-                        { required: true, message: '' },
-=======
->>>>>>> 56bff0cdff8b085c862fd2f9c3cb3fd6b325fc8b
                         {
                             pattern: phonePattern,
                             message: ''