From a0ee952c73f573df37556c68081e4ef1860eef51 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Jul 2022 01:42:24 +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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop
index 7150bfa8..62e857e7 100644
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@@ -7,7 +7,7 @@ Comment[ar]=سند «ضبطك» للتخزين
 Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড
 Comment[az]=KConfig Ayarlarını Saxlama Modulu
 Comment[be@latin]=Słužba schovišča dla systemy „KConfig”
-Comment[bg]=Storage backend for KConfig
+Comment[bg]=Съхраняващи операции на KConfig
 Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড
 Comment[bn_IN]=KConfig-র জন্য ব্যবহৃত ব্যাক-এন্ড সংগ্রহস্থল
 Comment[bs]=Skladišna pozadina za K‑konfig
-- 
cgit v1.2.1