l10n daemon script 2f7c77af18 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-01 01:53:35 +00:00
..
contents/code	scripts/minimizeall: Try to preserve last active window	2021-11-03 16:48:27 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-11-01 01:53:35 +00:00