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 · 92a0342cac
parent 9297e0efe4
commit 92a0342cac
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -7,6 +7,7 @@ Name[de]=Altai
 Name[el]=Altai
 Name[es]=Altai
 Name[fr]=Altai
+Name[ia]=Altai
 Name[it]=Altai
 Name[ko]=알타이
 Name[nl]=Altai