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"
6 years ago · 453f342c71
parent c1e66fa428
commit 453f342c71
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -2,6 +2,7 @@
 Name=Shell
 Name[az]=Üzlük
 Name[ca]=Shell
+Name[cs]=Shell
 Name[da]=Skal
 Name[de]=Flow
 Name[el]=Φλοιός