l10n daemon script 7230c95320 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"		2020-05-31 20:24:40 +02:00
..
contents/code	Update my email address	2020-01-14 18:17:18 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-31 20:24:40 +02:00