l10n daemon script 283211b4eb 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-10-10 06:19:16 +02:00
..
contents/ui	Fix minor EBN issues and typos	2018-10-07 21:23:20 +03:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:19:16 +02:00