Code review comment for lp:~sbi/openobject-addons/trunk-bug1101811

qdp (OpenERP) (qdp) wrote :

Hello St├ęphane,

unfortunatelly, it seems that something went wrong when you did the merge proposal, as while i' trying to merge your branch i'm getting a lot of conflicts. Maybe you solve a conflicts by pushing with --overwrite?

anyway, as the diff in launchpad was clear enough and very short i copied that by the hand.

thanks for the bug spotting and its fixing :-)

« Back to merge proposal