Code review comment for lp:~vthompson/music-app/remix-now-playing-main-view

Revision history for this message
Kill Animals (kill-animals) wrote :

> Victor; can you please make sure to merge my branch into this one? Perhaps you
> did not see, but I had it ready to merge, having solved all conflicts, until
> you did all this work today, which... I now have to go back and resolve a
> bunch of conflicts.
>
> Because of this too, you may have also done a bunch of work that was already
> done by myself.

Errm okay it actually wasnt that big of a deal; for some reason I thought you had done a bunch of work there, but it was actually just the old code from before. Sorry for sounding like a stickler.

Anyways nice work on all the other components. I merged from lp:~vthompson/music-app/remix-now-playing-main-view, and so my merge proposal into yours should be up to date.

« Back to merge proposal