l10n daemon script e3741c0570 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"		2016-12-20 13:25:24 +01:00
..
contents/ui	fix the close button	2016-09-03 10:27:12 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:25:24 +01:00