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 · 224f6c3744
parent 770cb95090
commit 224f6c3744
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -11,6 +11,7 @@ Name[es]=Aterrizaje seguro
 Name[fr]=Atterrissage en douceur
 Name[ia]=Atterrage secur (Safe Landing)
 Name[it]=Atterraggio sicuro
+Name[ko]=안전한 착륙
 Name[nl]=Veilige landing
 Name[nn]=Trygg landing
 Name[pl]=Bezpieczne lądowanie