l10n daemon script 4ca3a25d4f 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-03-09 01:15:44 +00:00
..
contents/ui	panel: Ensure panel is not floating	2023-11-16 23:48:24 -08:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-03-09 01:15:44 +00:00