From b062015f23349bb3f7fbeed70f6dc05ac3302049 Mon Sep 17 00:00:00 2001
From: Jakob Scheid <jakob.scheid@icloud.com>
Date: Sat, 25 Jul 2026 13:42:04 +0200
Subject: [PATCH] chore: resolve merge conflicts

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index a6170a3..5274388 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,7 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia';
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
 import App from './App.vue'
-import { i18n, loadLanguage } from './i18n';
+import { i18n, loadLanguage, fallbackLocale } from './i18n';
 import getCurrentLanguage from './utils/currentLanguage';
 import router from './router'
 import './styles/common.css'