fixed


On Sun, Feb 16, 2014 at 8:15 AM, jreback <notifications@github.com> wrote:

> In doc/source/release.rst:
>
> > @@ -146,6 +149,7 @@ Experimental Features
> >  Improvements to existing features
> >  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > +<<<<<<< HEAD
>
> these are the conflicts that you need to edit out
>
> --
> Reply to this email directly or view it on GitHub<https://github.com/pydata/pandas/pull/5978/files#r9776907>
> .
>