Use correct super pom
-<<<<<<< HEAD
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
- <artifactId>hapi-fhir</artifactId>
+ <artifactId>hapi-deployable-pom</artifactId>
<version>3.1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
</modules>
</project>
-=======
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ca.uhn.hapi.fhir</groupId>
- <artifactId>hapi-deployable-pom</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
- </parent>
- <artifactId>hapi-fhir-spring-boot</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>hapi-fhir-spring-boot-autoconfigure</module>
- <module>hapi-fhir-spring-boot-starter</module>
- <module>hapi-fhir-spring-boot-samples</module>
- </modules>
-
-</project>
->>>>>>> 9aea5569def20b9321a9b2e4c23fd93877c210cd
