From e7354c02d15728dbee811a968187b51e92be2417 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 13 Jan 2018 04:48:00 +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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org.kde.partitionmanager.desktop b/src/org.kde.partitionmanager.desktop
index fafef2f..756f054 100644
--- a/src/org.kde.partitionmanager.desktop
+++ b/src/org.kde.partitionmanager.desktop
@@ -176,6 +176,7 @@ Keywords[lt]=skaidinys;diskas;
 Keywords[nl]=partitie;schijf
 Keywords[pl]=partycja;dysk;
 Keywords[pt]=partição;disco;
+Keywords[sl]=razdelek;particija;disk;
 Keywords[sr]=partition;disk;партиција;диск;
 Keywords[sr@ijekavian]=partition;disk;партиција;диск;
 Keywords[sr@ijekavianlatin]=partition;disk;particija;disk;