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 · dd6a89903b
parent 040f883d26
commit dd6a89903b
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -10,6 +10,7 @@ Name[ko]=알타이
 Name[nl]=Altai
 Name[pl]=Altai
 Name[pt]=Altai
+Name[pt_BR]=Altai
 Name[sk]=Altai
 Name[sl]=Altaj
 Name[sv]=Altai