Fix conflicts

2020-05-19 16:57:47 -04:00
parent 0c6bceb8ba
commit f08080593c
1 changed files with 0 additions and 3 deletions
--- a/functions/pom.xml
+++ b/functions/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>