From 385507c3cb88c17b10c86181eb6a569cd5f08f07 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 12 Sep 2017 04:49:41 +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 213fe9a..f0e76b3 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -162,6 +162,7 @@ Categories=System;Filesystem;KDE;Qt;
 X-KDE-StartupNotify=true
 Keywords=partition;disk;
 Keywords[ca]=partició;disc;
+Keywords[ca@valencia]=partició;disc;
 Keywords[es]=partición;disco;
 Keywords[nl]=partitie;schijf
 Keywords[pt]=partição;disco;