From 417c7300ef01cc3aa0d11f8e5506d365855019e2 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 21 Nov 2015 19:21:44 +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 58962065..500088bb 100644
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@@ -5,6 +5,7 @@ X-KDE-ServiceType=KConfigBackend
 Comment=Storage backend for KConfig
 Comment[ar]=خلفية الحفظ لـ KConfig
 Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড
+Comment[ast]=Backend d'almacenamientu pa KConfig
 Comment[be@latin]=Słužba schovišča dla systemy „KConfig”
 Comment[bg]=Storage backend for KConfig
 Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড
-- 
cgit v1.2.1