Midori Web Browser

Code review comment for lp:~aauzi/midori/fix-1179200-5

  1. fix-1179200-5
  2. Merge into trunk
Revision history for this message
André Auzi (aauzi) wrote :

> > There are also merge artifacts in the diff like line 137
> I'm puzzled by this issue, I do see the artifacts in the diff here but not in
> the branch itself when I branch it again on my laptop.
>
> Could it be a bzr/launchpad issue?

OK I figured it was merge conflicts indicators.
I fixed it by merging in lp:midori

« Back to merge proposal