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 · Aug 4, 2019 · 067bef8 · 067bef8
1 parent a6e8414
commit 067bef8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/org.kde.kpat.desktop b/org.kde.kpat.desktop
@@ -141,6 +141,7 @@ Comment[nn]=Kabelspel
 Comment[pl]=Gra pasjans
 Comment[pt]=Jogo de cartas solitário
 Comment[pt_BR]=Jogo de cartas paciência
+Comment[sk]=Solitaire kartová hra
 Comment[sl]=Igra Pasjanse
 Comment[sr]=Игра пасијанса
 Comment[sr@ijekavian]=Игра пасијанса