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"
9 years ago · 1a598d0ef1
parent 494b7eac12
commit 1a598d0ef1
1 changed files with 0 additions and 1 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -12,7 +12,6 @@ X-KDE-System-Settings-Parent-Category=regionalsettings
 X-KDE-Weight=40

 Name=Language
-Name[ast]=Llingua
 Name[ca]=Idioma
 Name[ca@valencia]=Idioma
 Name[cs]=Jazyk