l10n daemon script f14540485f 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"		2017-07-29 04:45:55 +02:00
..
contents/code	Fix error introduced with 0950f4	2012-05-06 20:27:47 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-29 04:45:55 +02:00