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-03-25 05:53:37 +01:00
parent d0104009a9
commit 128ff82958
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -5,6 +5,7 @@ Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
+Name[fr]=NeoChat
 Name[ia]=Neochat
 Name[nl]=NeoChat
 Name[nn]=NeoChat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -4,6 +4,7 @@ Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[es]=NeoChat
+Name[fr]=NeoChat
 Name[ia]=Neochat
 Name[nl]=NeoChat
 Name[nn]=NeoChat