ignore conflict

duncdrum · duncdrum · commit aa7e6542e65c · 2019-08-30T23:15:51.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -12,11 +12,7 @@
 
   <groupId>org.exist-db</groupId>
   <artifactId>exist-documentation</artifactId>
-<<<<<<< HEAD
   <version>5.0.0-SNAPSHOPT</version>
-=======
-  <version>5.0.0</version>
->>>>>>> 17d7c3bd1bd182f9e416e02732fc73b7309ea8ac
 
   <name>eXist-db Documentation</name>
   <description>Documentation package for eXist-db</description>
