That was probably some lack of attention when resolving the conflict :)
sorry about the error


On Fri, Apr 26, 2013 at 12:03 AM, Ryan Bigg <notifications@github.com>wrote:

> In core/app/mailers/spree/test_mailer.rb:
>
> >      def test_email(user)
> >        subject = "#{Spree::Config[:site_name]} #{t('test_mailer.test_email.subject')}"
> > -      mail(:from => from_address, :to => user.email, :subject => subject)
> > +      mail(to: user.email, from: from_address, subject: subject)
>
> Looking much better :) Let me try running it over CI now.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/spree/spree/pull/2929/files#r3970667>
> .
>



-- 
Washington L Braga Jr
web developer