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-08-29 01:20:37 +00:00 · 2021-08-29 01:20:37 +00:00 · 216233c2ec
commit 216233c2ec
parent 0054d825c4
1 changed files with 1 additions and 0 deletions
--- a/src/effects/overview/kcm/overvieweffectkcm.desktop
+++ b/src/effects/overview/kcm/overvieweffectkcm.desktop
@ -18,6 +18,7 @@ Name[fr]=aperçu
 Name[it]=panoramica
 Name[lt]=apžvalga
 Name[nl]=overzicht
+Name[pl]=przegląd
 Name[pt]=introdução
 Name[sl]=pregled
 Name[sv]=översikt