From c0d5537afb10f09aaa6b47a994e8f8024c1006b4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 8 Dec 2015 10:05:01 +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/dolphinpart.desktop | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index 063ab152f..d1549f2d8 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -118,6 +118,7 @@ Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[nb]=Kompakt
 Name[nl]=Compact
+Name[nn]=Kompakt
 Name[pa]=ਸੰਖਿਪਤ
 Name[pl]=Kompaktowy
 Name[pt]=Compacta
-- 
cgit v1.3