Please make sure you mention the right username.
On Apr 17, 2014 5:05 PM, "Ahmed" <notifications@github.com> wrote:

> In tutor/config/routes.rb~:
>
> > @@ -1,13 +1,23 @@
> >  Tutor::Application.routes.draw do
> > +<<<<<<< HEAD
>
> this file should be ignored
>
> --
> Reply to this email directly or view it on GitHub<https://github.com/alaashafaee/Coolsoft-14/pull/171/files#r11724256>
> .
>