no message

src/main.js

@@ -16,13 +16,8 @@ import {
   weeklyTimeDivision,
   gcj02BD,
   verifyStoreType,
-<<<<<<< HEAD
-  formatChineseDate,
-  validatePhone,
-=======
   validatePhone,
   formatChineseDate,
->>>>>>> release
 } from '@/utils/index';
 import { toastLoading } from '@/utils/commonVant';
 import '@vant/touch-emulator';