l10n daemon script e40312bf5e 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-06-18 05:27:46 +02:00
..
contents/ui	Change the 'Dismiss all notifications' icon	2018-06-14 17:45:01 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:27:46 +02:00