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"
5 years ago · 93bd741b6d
parent f2b1c6c10f
commit 93bd741b6d
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -13,6 +13,7 @@ Name[nn]=Mjølkevegen
 Name[pt]=Via Láctea
 Name[pt_BR]=Via Láctea
 Name[ru]=Млечный Путь
+Name[sl]=Mlečna cesta
 Name[sv]=Vintergatan
 Name[uk]=Чумацький Шлях
 Name[x-test]=xxMilky Wayxx