l10n daemon script 2f923efd21 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"		2023-03-06 02:30:53 +00:00
..
contents/ui	remove default status	2023-03-01 16:25:49 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-06 02:30:53 +00:00