I will be late for 10 -15 minutes for the meeting.
On May 25, 2014 6:36 PM, "Eric Liao" <notifications@github.com> wrote:

> In src/scripts/create-csm.sql:
>
> > @@ -41,3 +263,62 @@ insert into users (username,password,first_name,last_name,email,cin)
> >  insert into users (username,password,first_name,last_name,email,cin)
> >         values ('ssaeedi','student123','Saman','Saeedi','ssaeedi@calstatela.edu',555666777);
> >
> > +<<<<<<< HEAD
>
> there is some merge conflict that is not resolved clean yet, please
> resolve this file.
>
> [image: :warning:]
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/rcliao/CS-537-CSM/pull/3/files#r13034161>
> .
>