l10n daemon script ff9bfc2e3b 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-20 01:44:06 +00:00
..
contents	effects/scale: Make it not grab open and close roles	2022-02-09 11:49:00 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-07-20 01:44:06 +00:00