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-07-28 02:18:15 +00:00
parent 559da66197
commit 8c14f8d2eb
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -8,6 +8,7 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -7,6 +7,7 @@ Name[cs]=NeoChat
 Name[de]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
+Name[eu]=NeoChat
 Name[fi]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat