From ae1da3f99e349619143ac3cdb3e0d91b84e3efab Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 26 Aug 2018 05:37:52 +0200
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(-)

(limited to 'src')

diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop
index e3bb6e9e..9c21cb2a 100644
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@@ -3,7 +3,7 @@ Type=ServiceType
 X-KDE-ServiceType=KConfigBackend
 
 Comment=Storage backend for KConfig
-Comment[ar]=سند «ضبطك» للتّخزين
+Comment[ar]=سند «ضبطك» للتخزين
 Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড
 Comment[ast]=Backend d'almacenamientu pa KConfig
 Comment[be@latin]=Słužba schovišča dla systemy „KConfig”
-- 
cgit v1.2.1