l10n daemon script 857bc9af3c 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-10-21 09:30:44 +00:00
..
contents/ui	[phonebook] Make use of the SectionScroller	2015-05-12 13:29:21 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-21 09:30:44 +00:00