From a2730fad4323c3af0b5198a31021eed9c9a336e7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 25 Sep 2019 05:15:10 +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, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index e75eeab99..3e71051ef 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -72,7 +72,7 @@ GenericName[id]=Pengelola File
 GenericName[it]=Gestore dei file
 GenericName[ja]=ファイルマネージャ
 GenericName[ko]=파일 관리자
-GenericName[lt]=Failų tvarkyklė
+GenericName[lt]=Failų tvarkytuvė
 GenericName[ml]=ഫയല്‍ മാനേജര്‍
 GenericName[nb]=Filbehandler
 GenericName[nl]=Bestandsbeheerder
-- 
cgit v1.3.1