l10n daemon script e534d5abad 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-09-26 05:57:20 +02:00
..
contents/ui	Prettify license headers	2020-08-07 19:57:56 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-26 05:57:20 +02:00