l10n daemon script 6276c8882e 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-04-23 01:18:39 +00:00
..
contents/code	effects: Properly copy previous geometry	2021-02-23 07:47:01 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-04-23 01:18:39 +00:00