l10n daemon script 258a844588 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-10-11 10:30:54 +00:00
..
contents/ui	Merge branch '1.x'	2016-09-10 22:53:37 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-11 10:30:54 +00:00