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"
10 years ago · b1b8626d1c
parent e285e51c9e
commit b1b8626d1c
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -13,6 +13,7 @@ X-KDE-Weight=40

 Name=Translations
 Name[ar]=الترجمات
+Name[ast]=Traducciones
 Name[bs]=Prevodi
 Name[ca]=Traduccions
 Name[ca@valencia]=Traduccions