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"
5 years ago · 6e6048bdb4
parent 3af84bff1e
commit 6e6048bdb4
1 changed files with 1 additions and 0 deletions
--- a/login-sessions/plasmax11.desktop.cmake
+++ b/login-sessions/plasmax11.desktop.cmake
@ -10,6 +10,7 @@ Name[eu]=Plasma (X11)
 Name[hu]=Plasma (X11)
 Name[nl]=Plasma (X11)
 Name[pt]=Plasma (X11)
+Name[sl]=Plasma (X11)
 Name[sv]=Plasma (X11)
 Name[uk]=Плазма (X11)
 Name[x-test]=xxPlasma (X11)xx