l10n daemon script af47edce54 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"		2018-04-04 05:20:09 +02:00
..
contents	Add template for Plasma wallpaper with QML extension	2018-04-03 16:38:14 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-04 05:20:09 +02:00