l10n daemon script ec0ca3976d 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-09-29 12:27:06 +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-09-29 12:27:06 +00:00