no message

package.json

@@ -43,12 +43,8 @@
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-vue": "^9.0.0",
     "prettier": "^2.5.1",
-<<<<<<< HEAD
-    "typescript": "^4.5.4"
-=======
     "typescript": "^4.5.4",
     "vite-plugin-svg-icons": "^2.0.1"
->>>>>>> 85a73ad8c69b6e2b206544c34083d0e7f3463e91
   },
   "browserslist": [
     "last 10 Chrome versions",

yarn.lock

@@ -3192,11 +3192,11 @@ jake@^10.8.5:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
-<<<<<<< HEAD
+
 js-md5@^0.7.3:
   version "0.7.3"
   resolved "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz"
-=======
+
 js-base64@^2.1.9:
   version "2.6.4"
   resolved "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
@@ -3205,7 +3205,7 @@ js-base64@^2.1.9:
 js-md5@^0.7.3:
   version "0.7.3"
   resolved "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2"
->>>>>>> 85a73ad8c69b6e2b206544c34083d0e7f3463e91
+
   integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==
 
 js-sdsl@^4.1.4:
@@ -3421,13 +3421,11 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-<<<<<<< HEAD
 md5-ts@^0.1.6:
   version "0.1.6"
   resolved "https://registry.npmjs.org/md5-ts/-/md5-ts-0.1.6.tgz"
   integrity sha512-xGl3IVril2ljBTTrSszfX7QDBzK9G7NBeFAMOBTB8oGlP3l90IRL4NEey65TQk/CuXTiw2qM28NWU2LiZIGOrg==
 
-=======
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmmirror.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -5045,17 +5043,11 @@ vue-i18n@^9.0.0:
     "@intlify/vue-devtools" "9.1.7"
     "@vue/devtools-api" "^6.0.0-beta.7"
 
-<<<<<<< HEAD
-vue-inline-svg@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/vue-inline-svg/-/vue-inline-svg-2.1.1.tgz"
-  integrity sha512-1m3UdbEneSHH4BTa2Bju/jnFy4QIHdhIWtGvkrkQRY03lJaM4JJ+hZBrgZw1jIB54SUh+5NYUiFEelnMz+DHQw==
-=======
 vue-inline-svg@next:
   version "3.1.0"
   resolved "https://registry.npmmirror.com/vue-inline-svg/-/vue-inline-svg-3.1.0.tgz#3cedcd4c2ae15a16a1cf3815a1b4170705a87519"
   integrity sha512-4FUu6q7l6jSL0sc8bs0lzV7MgWMsuSSQAJiQdKsxhGP9sNJfepCWiPfWxU1IPY1mf4LZjTtX93DAiEegWt6cTg==
->>>>>>> 85a73ad8c69b6e2b206544c34083d0e7f3463e91
+
 
 vue-router@^4.0.0:
   version "4.1.6"