From 973dfd484024f7248cff51ded0efc13e4d554f59 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 28 Nov 2021 01:24:43 +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/core/kconfigbackend.desktop | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop
index c3533986..e66e9105 100644
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@@ -34,7 +34,6 @@ Comment[he]=מנוע שמירה עבור KConfig
 Comment[hi]=के-कोन्फिग के लिए संचयन बैकएंड
 Comment[hne]=के-कानफिग बर भंडार बैकएण्ड
 Comment[hr]=Skladišna pozadina za KConfig
-Comment[hsb]=składowanski backend za KConfig
 Comment[hu]=Tároló a KConfighoz
 Comment[hy]=Բահեստի հետևի մասը KConfig-ի համար
 Comment[ia]=Retro-administration de immagazinage (storage) pro Kconfig
-- 
cgit v1.2.1