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-16 02:24:26 +00:00
parent 76b2d4ac49
commit cb1c9d1869
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -19,6 +19,7 @@ Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sk]=NeoChat
+Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -18,6 +18,7 @@ Name[pa]=ਨਿਓ-ਚੈਟ
 Name[pl]=NeoChat
 Name[pt_BR]=NeoChat
 Name[sk]=NeoChat
+Name[sl]=NeoChat
 Name[sv]=NeoChat
 Name[ta]=நியோச்சாட்
 Name[uk]=NeoChat