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 · aaf7a3af90
parent b37549a50b
commit aaf7a3af90
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -5,6 +5,7 @@ Name[ca]=Shell
 Name[de]=Flow
 Name[el]=Φλοιός
 Name[es]=Shell
+Name[eu]=Oskola
 Name[fr]=Interpréteur
 Name[it]=Shell
 Name[nl]=Shell