Yes, that's a mad merge conflict resolution.


On Wed, Sep 11, 2013 at 12:41 AM, Jacob Hansson <notifications@github.com>wrote:

> In community/server/pom.xml:
>
> > @@ -312,6 +312,12 @@
> >                </exclusion>
> >              </exclusions>
> >          </dependency>
> > +
> > +        <dependency>
> > +            <groupId>bouncycastle</groupId>
> > +            <artifactId>bcprov-jdk16</artifactId>
> > +        </dependency>
>
> Accidental paste? This dependency already exists further up in the file.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/neo4j/neo4j/pull/1170/files#r6287623>
> .
>