Fix parent version in emails/pom.xml to 10.0.0-SNAPSHOT

Author: ujibang

emails/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.restheart</groupId>
     <artifactId>restheart-parent</artifactId>
-    <version>9.6.1-SNAPSHOT</version>
+    <version>10.0.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.restheart</groupId>

pom.xml

@@ -6,11 +6,7 @@
 
     <groupId>org.restheart</groupId>
     <artifactId>restheart-parent</artifactId>
-<<<<<<< HEAD
     <version>10.0.0-SNAPSHOT</version>
-=======
-    <version>9.6.1-SNAPSHOT</version>
->>>>>>> 9.x
     <packaging>pom</packaging>
 
     <description>RESTHeart - Low code platform for cloud-native HTTP microservices.</description>