l10n daemon script 8b70761dcd 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-12-02 01:32:06 +00:00
..
contents	notifications: Implement popup notifications	2024-11-07 16:13:06 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-12-02 01:32:06 +00:00