From b10a84c770d17e06bf3e2999e935ff4dd3a203af Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 Mar 2020 05:36:51 +0100
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/dolphinpart.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index ca3f48c48..13e267ad5 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -137,7 +137,7 @@ Name[ja]=コンパクト
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts
-Name[ml]=തിങ്ങിയതായി
+Name[ml]=തിങ്ങിയത്
 Name[nb]=Kompakt
 Name[nl]=Compact
 Name[nn]=Kompakt
-- 
cgit v1.3