l10n daemon script 9c0a71c37f 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"		2019-07-13 05:18:09 +02:00
..
contents/code	[effects/fadedesktop] Rewrite it	2018-11-17 13:44:20 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00