From 72beb1377b6f3037d29d1405e015263cb8fbe2c9 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Sat, 8 Mar 2025 05:19:44 -0500
Subject: [PATCH] Fixing merge

---
 .../kafka-configmap-test-app/pom.xml                            | 0
 .../kafka-configmap-test-app/pom.xml                            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml

diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml
deleted file mode 100644
index e69de29b..00000000
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/pom.xml
index 5e6279d8..b6ad8a54 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/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>