Frak, I thought I had fixed this one :-)


On Wed, Jul 17, 2013 at 12:19 PM, Damien Pobel <notifications@github.com>wrote:

> In doc/bc/changes-5.2.md:
>
> > @@ -5,6 +5,7 @@ Changes affecting version compatibility with former or future versions.
> >
> >  ## Changes
> >
> > +<<<<<<< HEAD
>
> oops :p
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/ezsystems/ezpublish-kernel/pull/384/files#r5238593>
> .
>



-- 
--
Bertrand Dunogier
Lead Engineer eZ extensibility
eZ Systems AS | skype:bertrand-dunogier | http://www.ez.no/