l10n daemon script c8419144ad 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"		2020-06-18 05:45:52 +02:00
..
contents	new wallpaper	2016-02-24 20:26:19 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:45:52 +02:00