Fixing merge

Author: ryanjbaxter

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml

@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes-k8s-client-kafka-configmap-reload</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 		<version>3.2.1-SNAPSHOT</version>
-		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>
+<!--		<relativePath>../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps</relativePath>-->
 	</parent>
 	<modelVersion>4.0.0</modelVersion>