1 files changed, 1 insertions, 11 deletions
diff --git a/backend/locales/de-DE.json b/backend/locales/de-DE.json
index cb18b8b3..9e26dfee 100644
--- a/backend/locales/de-DE.json
+++ b/backend/locales/de-DE.json
@@ -1,11 +1 @@
-<<<<<<< HEAD
-{}
-=======
-{
-    "SettingsGeneralIndex": {
-        "other": {
-            "header": ""
-        }
-    }
-}
->>>>>>> 74d06aa (Update translation files)
+{}
+\ No newline at end of file