l10n daemon script 3847dc6d91 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"

2016-02-24 09:12:03 +00:00

..

contents

add a couple of plasmoid templates for kapptemplate/kdevelop

2015-11-30 15:02:43 +01:00

metadata.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2016-02-24 09:12:03 +00:00