From 2f0369b333ac5c714d59b74665e76a41a5936042 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 28 Jul 2023 01:43:52 +0000
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 src/settings/kcm/kcmdolphingeneral.json | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/settings/kcm/kcmdolphingeneral.json')

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 584aed1f0..57fcaa3da 100644
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -11,7 +11,6 @@
         "Name[cs]": "Obecné",
         "Name[da]": "Generelt",
         "Name[de]": "Allgemein",
-        "Name[el]": "Γενικά",
         "Name[en_GB]": "General",
         "Name[eo]": "Ĝenerala",
         "Name[es]": "General",
-- 
cgit v1.3