From 9d6386decbb7a1a2b92c0d76e2895ad29ba2ca09 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Thu, 4 Apr 2024 16:15:34 +0200
Subject: [PATCH] lost update

---
 backend/src/config/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index b71e59488..a73a3be70 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -19,11 +19,7 @@ const constants = {
   LOG_LEVEL: process.env.LOG_LEVEL ?? 'info',
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-<<<<<<< HEAD
-    EXPECTED: 'v22.2024-03-06',
-=======
     EXPECTED: 'v22.2024-03-14',
->>>>>>> master
     CURRENT: '',
   },
 }