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

2017-01-16 06:06:25 +01:00

..

contents

Add a kapptemplate for Plasma Wallpaper

2016-08-05 16:02:14 +02:00

metadata.desktop

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

2017-01-16 06:06:25 +01:00