I see there will be many things to address. I will pause on these quick
replies until Tyler and I have a fix.


On Sun, Mar 23, 2014 at 9:08 PM, @anotheruiguy <notifications@github.com>wrote:

> In chris-eisenbraun-b12/css/layout.css:
>
> > +footer p {
> > +	margin-left: 1.5em;
> > +}
> > +
> > +/*use of floats*/
> > +.left {
> > +	float: left;
> > +}
> > +
> > +.right {
> > +	float: right;
> > +=======
> > +}
> > +footer a {
> > +	font-size: 1.2em;
> > +>>>>>>> 51e0724cc293119c3ff4e67e0c0bdc806019aad4
>
> Merge conflicts need to be removed from the code.
>
> --
> Reply to this email directly or view it on GitHub<https://github.com/blackfalcon/UXEBootCamp-B12.CSSLayout/pull/3/files#r10872365>
> .
>