l10n daemon script f6bb0229b0 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-03-27 06:24:35 +01:00
..
contents/ui	Port away from Title and towards level 1 Heading	2020-02-21 08:39:25 -07:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-27 06:24:35 +01:00