l10n daemon script ce39def7d1 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"		2021-06-28 01:23:35 +00:00
..
contents	Port to singleton Units	2021-03-07 13:34:47 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-06-28 01:23:35 +00:00