l10n daemon script cc43a72884 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-14 05:43:50 +02:00
..
contents/ui	Merge branch '1.x'	2017-07-12 11:37:41 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-14 05:43:50 +02:00