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 · 85b1a822c0
parent 5e0898f236
commit 85b1a822c0
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[ca]=Plasma (X11)
 Name[en_GB]=Plasma (X11)
 Name[es]=Plasma (X11)
 Name[eu]=Plasma (X11)
+Name[fi]=Plasma (X11)
 Name[fr]=Plasma (X11)
 Name[hu]=Plasma (X11)
 Name[ia]=Plasma (X11)