l10n daemon script b4e008847a 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-11-25 04:58:17 +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	2016-11-25 04:58:17 +01:00