From d5c1ac07db9bf9d97cab3cc09918286870fa377c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Jun 2020 16:57:19 +0200
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 6404808ee..175b887de 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -42,7 +42,6 @@ Name[sr@latin]=Dolphin
 Name[sv]=Dolphin
 Name[tr]=Dolphin
 Name[uk]=Dolphin
-Name[x-test]=xxDolphinxx
 Name[zh_CN]=Dolphin
 Name[zh_TW]=Dolphin
 Exec=dolphin %u
@@ -94,7 +93,6 @@ GenericName[sr@latin]=Menadžer fajlova
 GenericName[sv]=Filhanterare
 GenericName[tr]=Dosya Yöneticisi
 GenericName[uk]=Менеджер файлів
-GenericName[x-test]=xxFile Managerxx
 GenericName[zh_CN]=文件管理器
 GenericName[zh_TW]=檔案管理員
 Terminal=false
-- 
cgit v1.3