Migrate demo pom

Author: AB-xdev

demos/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>root</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>demos</artifactId>

demos/sessionize-java-client-demo/pom.xml

@@ -6,20 +6,11 @@
 
 	<parent>
 		<groupId>software.xdev</groupId>
-<<<<<<<< HEAD:sessionize-java-client-demo/pom.xml
-		<artifactId>sessionize-java-client-root</artifactId>
+		<artifactId>demos</artifactId>
 		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sessionize-java-client-demo</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
-========
-		<artifactId>demos</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>template-placeholder-demo</artifactId>
->>>>>>>> origin/update-from-template-github_com_xdev-software_openapi-client-maven-template_master:demos/template-placeholder-demo/pom.xml
 	<packaging>jar</packaging>
 
 	<properties>