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"
2021-06-14 01:15:12 +00:00
parent b412719f2c
commit 5c6a540807
2 changed files with 2 additions and 0 deletions
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -21,6 +21,7 @@ Name[pl]=NeoChat
 Name[pt]=NeoChat
 Name[pt_BR]=NeoChat
 Name[ro]=NeoChat
+Name[sk]=NeoChat
 Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்