On Sun, Apr 29, 2007 at 07:40:55PM +0200, Vincent Torri wrote: > > > On Sun, 29 Apr 2007, Jeff Muizelaar wrote: > > Is it normal to have those '>>>>>>' ? Nope. It was a ChangeLog conflict that I didn't fix properly. I won't miss having to muck with that file when we move to a saner scm. -Jeff