l10n daemon script 5317ca9da0 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"		2021-07-27 01:25:25 +00:00
..
contents/code	effects/squash: Use cubic easing curve	2021-05-11 19:25:31 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-27 01:25:25 +00:00