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 · 2be7d7be10
parent 92a0342cac
commit 2be7d7be10
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]=Altai
 Name[cs]=Altai
 Name[de]=Altai
 Name[el]=Altai
+Name[en_GB]=Altai
 Name[es]=Altai
 Name[fr]=Altai
 Name[ia]=Altai