From 8fabc861b39d58ffd52f6a9dd36a5e72126f31a6 Mon Sep 17 00:00:00 2001
From: Crossy147 <kamilos147@gmail.com>
Date: Mon, 15 Feb 2016 21:57:26 +0100
Subject: [PATCH] pom.xml minor

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

diff --git a/pom.xml b/pom.xml
index d4e5a516f..e3bb0d51d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,12 +119,9 @@
 		<module>publish-subscribe</module>
 		<module>delegation</module>
 		<module>event-driven-architecture</module>
-<<<<<<< HEAD
 		<module>factory-kit</module>
-=======
 		<module>feature-toggle</module>
 		<module>value-object</module>
->>>>>>> f1122f78e32c4db99b42bc224344651dba9b0757
 	</modules>
 
 	<dependencyManagement>