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-01-22 06:35:04 +01:00 · 2018-01-22 06:35:04 +01:00 · 1e09646791
commit 1e09646791
parent 0d2a341723
1 changed files with 1 additions and 0 deletions
--- a/effects/slide/slide_config.desktop
+++ b/effects/slide/slide_config.desktop
@ -42,6 +42,7 @@ Name[ml]=തെന്നിമാറുക
 Name[mr]=सरकणे
 Name[nds]=Glieden
 Name[nl]=Schuiven
+Name[nn]=Skliding
 Name[pa]=ਸਲਾਈਡ
 Name[pl]=Slajd
 Name[pt]=Deslizar