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-05-26 02:28:13 +00:00
parent 5db3e14ae6
commit 8913aa8a66
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -6,6 +6,7 @@ Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[ia]=Neochat
+Name[it]=NeoChat
 Name[ko]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -5,6 +5,7 @@ Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
 Name[fi]=NeoChat
 Name[ia]=Neochat
+Name[it]=NeoChat
 Name[ko]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat