l10n daemon script cd6f56a443 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"		2018-08-11 05:34:25 +02:00
..
contents	[effects/fade] Don't animate the logout screen	2018-08-05 11:58:13 +03:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-11 05:34:25 +02:00