From a87fcdf0b75310c65f789d2fdb00d14a10d7d1bf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Jun 2020 13:55:36 +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"
---
 org.kde.kmag.desktop | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/org.kde.kmag.desktop b/org.kde.kmag.desktop
index 315ccd6..cff1391 100755
--- a/org.kde.kmag.desktop
+++ b/org.kde.kmag.desktop
@@ -70,7 +70,6 @@ Name[tr]=KMag
 Name[ug]=KMag
 Name[uk]=KMag
 Name[vi]=Kính lúp K
-Name[x-test]=xxKMagxx
 Name[zh_CN]=放大镜
 Name[zh_TW]=K-放大鏡
 GenericName=Screen Magnifier
@@ -142,7 +141,6 @@ GenericName[uk]=Збільшувач екрана
 GenericName[uz]=Ekranni kattalashtiruvchi
 GenericName[uz@cyrillic]=Экранни катталаштирувчи
 GenericName[vi]=Phóng đại Màn hình
-GenericName[x-test]=xxScreen Magnifierxx
 GenericName[zh_CN]=屏幕放大镜
 GenericName[zh_TW]=螢幕放大鏡
 Comment=A screen magnification tool
@@ -177,7 +175,6 @@ Comment[sr@latin]=Alatka za uveličavanje ekrana
 Comment[sv]=Ett skärmförstoringsglas
 Comment[tr]=Bir ekran büyütme aracı
 Comment[uk]=Цифрове збільшувальне скло для екрана
-Comment[x-test]=xxA screen magnification toolxx
 Comment[zh_CN]=屏幕放大工具
 Comment[zh_TW]=螢幕放大工具
 Categories=Qt;KDE;Utility;Accessibility;
-- 
GitLab