l10n daemon script 6835f49d8c 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"		2024-07-18 01:19:02 +00:00
..
contents	layout-templates: Split out status bar and navigation panel to separate templates	2024-07-15 17:07:26 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-07-18 01:19:02 +00:00