l10n daemon script 6fa6c3f20b 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-07-01 01:52:46 +00:00
..
contents/code	Support new AppletPopup window type	2022-05-27 21:49:37 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-07-01 01:52:46 +00:00