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"
KDE · Oct 24, 2017 · 9e23b0d · 9e23b0d
1 parent 3394632
commit 9e23b0d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/org.kde.kpat.desktop b/org.kde.kpat.desktop
@@ -138,6 +138,7 @@ Comment[sr@ijekavian]=Игра пасијанса
 Comment[sr@ijekavianlatin]=Igra pasijansa
 Comment[sr@latin]=Igra pasijansa
 Comment[sv]=Patienskortspel
+Comment[tr]=Solitaire kart oyunu
 Comment[uk]=Карткова гра у пасьянс
 Comment[x-test]=xxSolitaire card gamexx
 X-DBUS-StartupType=Multi