Re: Git conflicts

[Valentin Villenave]

2008/6/20 Rune Zedeler <address@hidden>:
> As it has been 9 months since i branched off dev/rune I tried to merge
> master into dev/rune to test how it went.

> And then I was flooded with conflicts.

I must be the one to blame here (even though I don't know why).

When I merged your branch several weeks ago I didn't encounter any
problem. So I must have screwed up something when you asked me to
revert this merge...

Please try to revert my last commit; perhaps this would help?

Cheers,
Valentin