l10n daemon script 3577e59bc0 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-07 09:31:42 +00: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-10-07 09:31:42 +00:00