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"
2018-03-31 05:20:59 +02:00 · 2018-03-31 05:20:59 +02:00 · e61383a198
parent 961cc518fb
commit e61383a198
1 changed files with 1 additions and 1 deletions
--- a/effects/blur/blur_config.desktop
+++ b/effects/blur/blur_config.desktop
@ -39,7 +39,7 @@ Name[hr]=Mrlja
 Name[hsb]=Młowojty
 Name[hu]=Elmosódás
 Name[ia]=Obscura (Blur)
-Name[id]=Samar
+Name[id]=Buram
 Name[is]=Móða
 Name[it]=Sfocatura
 Name[ja]=ぼかし