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 · 28d0c88b5d
parent c57d8fdf30
commit 28d0c88b5d
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -14,6 +14,7 @@ Name[it]=Shell
 Name[ko]=셸
 Name[nl]=Shell
 Name[nn]=Skal
+Name[pl]=Powłoka
 Name[pt]=Consola
 Name[pt_BR]=Concha
 Name[ro]=Înveliș