l10n daemon script cdc85e95dc 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-03-20 02:11:23 +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-03-20 02:11:23 +00:00