latte-dock/applets/spacer
l10n daemon script 3f4fa6699c 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"
..
package SVN_SILENT made messages (.desktop file) - always resolve ours
CMakeLists.txt
LICENSE
Messages.sh use kde translations infrastructure
metadata.desktop.cmake SVN_SILENT made messages (.desktop file) - always resolve ours