l10n daemon script 2eb495a66b 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-02-28 02:08:53 +00:00
..
contents/ui	flashlight: Mark itself as unavailable if unavailable	2022-07-07 14:09:24 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-02-28 02:08:53 +00:00