From f86f153a8050c9337e0f6c7b84171f50474df3b1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Dec 2016 12:50:08 +0100
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(-)

(limited to 'src')

diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop
index 37e1b961..5e85f2b8 100644
--- a/src/core/kconfigbackend.desktop
+++ b/src/core/kconfigbackend.desktop
@@ -5,7 +5,6 @@ X-KDE-ServiceType=KConfigBackend
 Comment=Storage backend for KConfig
 Comment[ar]=سند «ضبطك» للتّخزين
 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