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"
2017-05-23 05:54:25 +02:00 · 2017-05-23 05:54:25 +02:00 · 67ab6d9b31
parent 0f66fa648f
commit 67ab6d9b31
1 changed files with 1 additions and 0 deletions
--- a/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
+++ b/kcmkwin/kwinscreenedges/kwintouchscreen.desktop
@ -15,6 +15,7 @@ Name[ca]=Pantalla tàctil
 Name[ca@valencia]=Pantalla tàctil
 Name[cs]=Dotyková obrazovka
 Name[de]=Touchscreen
+Name[el]=Οθόνη αφής
 Name[en_GB]=Touch Screen
 Name[es]=Pantalla táctil
 Name[it]=Schermo a sfioramento