From 789a014df258155371bc3e9fe368ccf1555f5cbd Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 7 May 2021 01:18:46 +0000
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 928bb5d..ae147c1 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -175,7 +175,7 @@ Keywords[ca]=partició;disc;
 Keywords[ca@valencia]=partició;disc;
 Keywords[cs]=oddíl;disk;
 Keywords[da]=partition;disk;
-Keywords[de]=partition;disk;festplatte
+Keywords[de]=partition;disk;festplatte;
 Keywords[el]=κατάτμηση;δίσκος;
 Keywords[en_GB]=partition;disk;
 Keywords[es]=partición;disco;