fixup bad merge on logo

This commit is contained in:
778a69cd 2024-04-10 16:17:42 +02:00
parent ad05c9ea93
commit e9d17efa37
2 changed files with 2 additions and 4 deletions

5
package-lock.json generated
View file

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

View file

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