From f82d589a726253545a4a50dbf59111a3c7605ffb Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Tue, 19 May 2020 16:57:47 -0400
Subject: [PATCH] Fix conflicts

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f921301..94c3cc2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,10 +42,7 @@
   	<modules>
 		<module>common/ftp-common</module>
 		<module>common/function-test-support</module>
-<<<<<<< HEAD
 		<module>common/tcp-common</module>
-=======
->>>>>>> MQTT source as supplier/source
 		<module>common/mqtt-common</module>
 
 		<module>consumer/cassandra-consumer</module>