l10n daemon script 5131546336 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-17 14:13:18 +02:00
..
contents	Avoid monochrome icons in launcher and task panel	2020-02-12 18:17:20 +03:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-17 14:13:18 +02:00