l10n daemon script 104f37b8c8 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"		2015-03-16 10:11:21 +00:00
..
contents/ui	bind setAssociatedApplicationUrls	2014-08-07 19:34:57 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-16 10:11:21 +00:00