From 0c9d90df102aab55babb0730c357d57d8405a0d6 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 25 May 2023 20:32:36 +0000
Subject: Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translation: Decky/Decky
Translate-URL: https://weblate.werwolv.net/projects/decky/decky/
---
 backend/locales/de-DE.json | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'backend')

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
-- 
cgit v1.2.3