From 4c970221f8ba7506e96ae7655fee0c4c27768102 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 26 Mar 2015 04:46:00 +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(+)

(limited to 'src')

diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index bb63e45b..17b46ffa 100755
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -57,6 +57,7 @@ GenericName[da]=Webbrowser
 GenericName[de]=Webbrowser
 GenericName[el]=Περιηγητής ιστού
 GenericName[en_GB]=Web Browser
+GenericName[eo]=TTT-foliumilo
 GenericName[es]=Navegador web
 GenericName[et]=Veebilehitseja
 GenericName[eu]=Web-arakatzailea
-- 
cgit v1.2.1