l10n daemon script 71b8f9b22d 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-09-09 09:25:38 +00:00
..
contents	Fix: update wallpaper example Autumn's config.qml to QtQuick.Controls	2016-08-03 23:01:07 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-09 09:25:38 +00:00