l10n daemon script c4e2b393ad 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-12-13 04:10:48 +01:00
..
contents/ui	[dialer] Remove remnants of voicecall	2015-09-11 08:45:59 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 04:10:48 +01:00