l10n daemon script 5427754e21 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-08-01 04:51:32 +02:00
..
contents/ui	sms: forgot to add the file	2019-07-21 20:13:10 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-01 04:51:32 +02:00