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-30 01:14:29 +00:00
parent 308af0d3cd
commit bb3f4297b0
2 changed files with 3 additions and 0 deletions
--- 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[cs]=NeoChat
+Name[de]=NeoChat
 Name[es]=NeoChat
 Name[fr]=NeoChat
 Name[ia]=Neochat