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-04-03 01:13:00 +00:00
parent eab5a43a2e
commit 868d8108ac
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -9,6 +9,7 @@ Name[de]=NeoChat
 Name[es]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
+Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -8,6 +8,7 @@ Name[de]=NeoChat
 Name[es]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat
+Name[it]=NeoChat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
 Name[pt]=NeoChat