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"
2023-10-26 02:17:19 +00:00
parent a64c80109e
commit 5828ee1ada
3 changed files with 3 additions and 0 deletions
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -4,6 +4,7 @@
 Version=1.5
 Name=NeoChat
 Name[ar]=نيوتشات
+Name[ast]=NeoChat
 Name[az]=NeoChat
 Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat