Merge branch 'master' of https://github.com/eXist-db/documentation

Author: duncdrum

pom.xml

@@ -12,7 +12,11 @@
 
   <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>