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-17 12:07:25 +01:00
parent aad95d2bc3
commit 70dba75d31
2 changed files with 3 additions and 0 deletions
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -2,6 +2,7 @@
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[cs]=Neochat
 Name[da]=Neochat
 Name[de]=Neochat
 Name[en_GB]=Neochat