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-04-19 10:54:27 +00:00 · 2016-04-19 10:54:27 +00:00 · 9f1b9e7af5
commit 9f1b9e7af5
parent 7944fc1d6f
1 changed files with 1 additions and 0 deletions
--- a/src/desktoptheme/breeze-light/metadata.desktop
+++ b/src/desktoptheme/breeze-light/metadata.desktop
@ -8,6 +8,7 @@ Name[de]=Breeze Light
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
 Name[fi]=Breeze Light
+Name[gl]=Breeze claro
 Name[it]=Brezza chiaro
 Name[nl]=Breeze Light
 Name[pl]=Lekka Bryza