Re: Conflicts, conflicts everywhere

[Francisco Vila]

2009/6/9 John Mandereau <address@hidden>:
> Except that I've been more idle on merging lately, not only because I've
> been busy, but because I described the merging policy in the Contributors'
> Guide and at least you are able to apply it.

Yes but it is still a bit difficult to see the whole frame, I'm sorry.

> I can look at merging lilypond/translation and master if you like, but not
> before the middle of next week.

Yes, please. I withdraw for a while off this, I am exhausted.

I'm just not that brilliant but I'm doing all my best.
-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org