From d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 30 Nov 2015 10:26:25 +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/org.kde.dolphin.desktop | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 9340021cf..63b4d1f59 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -3,7 +3,6 @@ Name=Dolphin
 Name[ca]=Dolphin
 Name[ca@valencia]=Dolphin
 Name[cs]=Dolphin
-Name[da]=Dolphin
 Name[de]=Dolphin
 Name[el]=Dolphin
 Name[en_GB]=Dolphin
@@ -48,7 +47,6 @@ GenericName=File Manager
 GenericName[ca]=Gestor de fitxers
 GenericName[ca@valencia]=Gestor de fitxers
 GenericName[cs]=Správce souborů
-GenericName[da]=Filhåndtering
 GenericName[de]=Dateiverwaltung
 GenericName[el]=Διαχειριστής αρχείων
 GenericName[en_GB]=File Manager
-- 
cgit v1.3