Thanks

I got the idea tonight in class

 

Will correct

 

 

Dan Williams, PMP, PMI-ACP, CSP

Cell: 425-8776333

שָׁלוֹם עֲלֵיכֶם‎

peace to you

 

 

From: Renée Hendricksen [mailto:notifications@github.com] 
Sent: Wednesday, January 22, 2014 8:28 PM
To: UWE-Ruby/RubyWinter2014
Cc: danielwilliams12
Subject: Re: [RubyWinter2014] Week one in class homework (#15)

 

In week1/exercises/roster.txt:

> @@ -1,4 +1,17 @@
>  #, name, email, github, twitter, hip chat 
> +<<<<<<< HEAD

These symbols are what you see when there is a merge conflict.

—
Reply to this email directly or view it on GitHub <https://github.com/UWE-Ruby/RubyWinter2014/pull/15/files#r9102741> .  <https://github.com/notifications/beacon/6365571__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcwNTk4NDA2NSwiZGF0YSI6eyJpZCI6MjMyNzI1MDF9fQ==--fcd5ccd69e56023af92c00ad2a1743fe9af83d0f.gif>