l10n daemon script 13dc03991d 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-02-06 09:49:14 +00:00
..
contents/ui	Port testcontainment to units.longDuration	2014-02-04 01:35:52 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-06 09:49:14 +00:00