From a4773460f0eb443c093ee4f1505fa68648172600 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 26 Jul 2018 05:44:16 +0200
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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index b7a09d0..67cf186 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -168,6 +168,7 @@ Keywords[de]=partition;disk;festplatte
 Keywords[el]=κατάτμηση;δίσκος;
 Keywords[en_GB]=partition;disk;
 Keywords[es]=partición;disco;
+Keywords[fr]=partition;disque;
 Keywords[gl]=partition;disk;partición;disco;
 Keywords[id]=partisi;disk;
 Keywords[it]=partizione;disco;