pom.xml minor

2016-02-15 21:57:26 +01:00 · 2016-02-15 21:57:26 +01:00 · 8fabc861b3
commit 8fabc861b3
parent 53fdaba6c4
1 changed files with 0 additions and 3 deletions
--- 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>