l10n daemon script da87b880f8 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-09-30 08:39:58 +02:00
..
contents/ui	Change the 'Dismiss all notifications' icon	2018-09-06 18:20:07 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-30 08:39:58 +02:00