From 702c4ffd274df7dcf71378ec67a95f5b32b7a43d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 20 Jan 2020 05:46:17 +0100
Subject: [PATCH] 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.partitionmanager.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index 3ed569f..286ebda 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -181,7 +181,7 @@ Keywords[id]=partisi;disk;
 Keywords[it]=partizione;disco;
 Keywords[ko]=partition;disk;파티션;디스크;
 Keywords[lt]=skaidinys;diskas;
-Keywords[nl]=partitie;schijf
+Keywords[nl]=partitie;schijf;
 Keywords[nn]=partisjon;disk;
 Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;