From a787d1a21dc8d475fa3e2350e2c13ccd33d82d19 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 25 Oct 2020 05:12:30 +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"
---
 linux/org.eu.encom.spectral.desktop | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linux/org.eu.encom.spectral.desktop b/linux/org.eu.encom.spectral.desktop
index 0ae353f5b..5c46f333f 100644
--- a/linux/org.eu.encom.spectral.desktop
+++ b/linux/org.eu.encom.spectral.desktop
@@ -7,4 +7,3 @@ Terminal=false
 Icon=org.eu.encom.spectral
 Type=Application
 Categories=Network;InstantMessaging;
-Name[en_US]=Spectral