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"
2016-02-27 09:29:41 +00:00 · 2016-02-27 09:29:41 +00:00 · 361204cbee
commit 361204cbee
parent d524d96a25
1 changed files with 1 additions and 0 deletions
--- a/src/desktoptheme/breeze-light/metadata.desktop
+++ b/src/desktoptheme/breeze-light/metadata.desktop
@ -5,6 +5,7 @@ Name[ca@valencia]=Brisa clara
 Name[de]=Breeze Light
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
+Name[it]=Brezza chiaro
 Name[nl]=Breeze Light
 Name[pl]=Lekka Bryza
 Name[pt]=Brisa Clara