l10n daemon script bba776a5fb 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-01-05 02:08:21 +00:00
..
contents/ui	navigationpanel: Have it on the bottom if the screen height is large enough	2023-11-22 20:48:22 -08:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-05 02:08:21 +00:00