l10n daemon script 44f04e5c56 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-11-08 06:24:01 +01:00
..
contents	icon in front of the thumbnail	2020-10-26 14:51:25 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-11-08 06:24:01 +01:00