No, keep it on the other branch.
On May 12, 2014 3:01 PM, "VitSalis" <notifications@github.com> wrote:

> In static/script/user/view.js:
>
> > +        var $image = $( '.avatar img' );
> > +        var imgWidth = $image.width();
> > +        var imgHeight = $image.height();
> > +
> > +        height = width = 168;
> > +
> > +        if ( imgWidth > imgHeight ) {
> > +            $image.height( height );
> > +            $image.css( 'top', 0 );
> > +            $image.css( 'left', -Math.floor( ( $image.width() - width ) / 2 ) );
> > +        }
> > +        else {
> > +            $image.width( width );
> > +            $image.css( 'left', 0 );
> > +            $image.css( 'top', -Math.floor( ( $image.height() - height ) / 2 ) );
> > +        }
>
> I've already done this in another branch, should I do it here too? There
> will be conflicts.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/dionyziz/endofcodes/pull/256/files#r12524580>
> .
>