pom.xml conflict resolved
[maven-release-plugin] prepare for next development iteration
pom.xml conflict resolved
pom.xml conflict resolved