l10n daemon script 1fec8612dc 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"		2022-11-20 01:50:06 +00:00
..
contents/ui	mmplugin: Cleanup signals	2022-10-23 15:33:47 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-11-20 01:50:06 +00:00