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"
2020-12-14 09:28:48 +01:00
parent bcd9237559
commit 7fe3c53661
2 changed files with 2 additions and 0 deletions
--- a/neochat.notifyrc
+++ b/neochat.notifyrc
@@ -3,6 +3,7 @@ IconName=neochat
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[da]=Neochat
 Name[en_GB]=Neochat
 Name[es]=Neochat
 Name[fr]=Neochat
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -2,6 +2,7 @@
 Name=Neochat
 Name[ca]=Neochat
 Name[ca@valencia]=Neochat
+Name[da]=Neochat
 Name[en_GB]=Neochat
 Name[es]=Neochat
 Name[fr]=Neochat