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"
4 years ago · a2b2999f41
parent f85b5b1fcd
commit a2b2999f41
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -19,6 +19,7 @@ Name[sl]=Medeni pljusk
 Name[sv]=Honungsvåg
 Name[uk]=Медова хвиля
 Name[x-test]=xxHoneywavexx
+Name[zh_CN]=Honeywave 金波

 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=Ken Vermette