Commit af44f2cc authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 4e149631
......@@ -4,6 +4,7 @@ Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
Name=Plasma (X11)
Name[ast]=Plasma (X11)
Name[az]=Plasma (X11)
Name[ca]=Plasma (X11)
Name[en_GB]=Plasma (X11)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment