l10n daemon script fd64a8bcc7 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-01-06 05:54:14 +01:00
..
contents/ui	Prefer properties to functions	2016-11-23 19:45:35 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-06 05:54:14 +01:00