audit4j-demo-spring pom.xml conflict

[carlphilipp]

Hello,

There is a conflict:

<<<<<<< HEAD
<audit4j.version>2.5.0-SNAPSHOT</audit4j.version>
<audit4j-spring.version>2.4.1</audit4j-spring.version>
<audit4j-db.version>2.4.0-alpha1</audit4j-db.version>

=======
<audit4j.version>2.5.0</audit4j.version>
<audit4j-db.version>2.4.1</audit4j-db.version>

	<jdk.version>1.7</jdk.version>

6588c9a

Regards,
Carl

[Gabri]

yes, and it's still there...