fixup bad merge on logo

package-lock.json

@@ -6,8 +6,7 @@
   "packages": {
     "": {
       "name": "mobilizon",
-      "version": "4.1.0",
-      "hasInstallScript": true,
+      "version": "5.0.0-beta.1",
       "dependencies": {
         "@apollo/client": "^3.9.5",
         "@framasoft/socket": "^1.0.0",
@@ -125,8 +124,8 @@
         "sass": "^1.34.1",
         "typescript": "~5.3.2",
         "vite": "^5.0.12",
-        "vite-svg-loader": "^4.0.0",
         "vite-plugin-pwa": "^0.19.0",
+        "vite-svg-loader": "^4.0.0",
         "vitest": "^1.2.2",
         "vue-i18n-extract": "^2.0.4",
         "vue-router-mock": "^1.0.0"

src/components/MobilizonLogo.vue

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
   <figure>
     <svgLogo/>
   </figure>