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"
2021-11-22 01:30:44 +00:00 · 2021-11-22 01:30:44 +00:00 · 16d473a326
commit 16d473a326
parent f07c66f040
1 changed files with 1 additions and 0 deletions
--- a/src/effects/overview/kcm/overvieweffectkcm.desktop
+++ b/src/effects/overview/kcm/overvieweffectkcm.desktop
@ -27,6 +27,7 @@ Name[nl]=overzicht
 Name[pl]=przegląd
 Name[pt]=introdução
 Name[pt_BR]=visão geral
+Name[sk]=Prehľad
 Name[sl]=pregled
 Name[sv]=översikt
 Name[uk]=огляд