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"
4 years ago · 219cd7b115
parent ca7342d542
commit 219cd7b115
1 changed files with 1 additions and 0 deletions
--- a/colors/BreezeClassic.colors
+++ b/colors/BreezeClassic.colors
@ -117,6 +117,7 @@ Name[hu]=Breeze Classic
 Name[ia]=Brisa Classic
 Name[nl]=Breeze Classic
 Name[pl]=Klasyczna Bryza
+Name[pt_BR]=Breeze Classic
 Name[sl]=Sapica klasična
 Name[sv]=Breeze klassisk
 Name[uk]=Класична Breeze