From 594e62461f2f3b22dffda7470124de32125b6ed6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 29 Nov 2021 01:30:30 +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 insertion(+)

(limited to 'src')

diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop
index e66e9105..c3533986 100644
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@@ -34,6 +34,7 @@ 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