From 9af0b91fadd6517e48b34bafeb1ce5459ef0369b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 3 Apr 2015 04:40:59 +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/data/rekonq.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 17b46ffa..d53ff3d4 100755
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Rekonq
+Name[ast]=Rekonq
 Name[bg]=Rekonq
 Name[bs]=Rekonq
 Name[ca]=Rekonq
-- 
cgit v1.2.1