l10n daemon script ffcdd751ea 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"		2020-03-10 06:10:13 +01:00
..
contents/code	Move from Quad to Cubic	2020-03-04 19:40:35 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-10 06:10:13 +01:00