l10n daemon script ad34f6f112 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-21 01:22:04 +00:00
..
contents/ui	startupfeedback: Change to be window based and controlled by a model	2024-07-13 16:30:07 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-07-21 01:22:04 +00:00