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-09-01 10:04:17 +00:00 · 2016-09-01 10:04:17 +00:00 · 7e77a49757
commit 7e77a49757
parent d3741bd530
1 changed files with 1 additions and 1 deletions
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@ -30,7 +30,7 @@ Name[fi]=Ikkunoiden kehykset
 Name[fr]=Décorations de fenêtres
 Name[ga]=Maisiúcháin Fhuinneog
 Name[gl]=Decoración da xanela
-Name[he]=קישוטי חלון
+Name[he]=מסגרת חלון
 Name[hi]=विंडो सजावट
 Name[hr]=Ukrasi prozora
 Name[hu]=Ablakdekorációk