From 74ac79b01ecb5fe47810e3cfba71e274349144a6 Mon Sep 17 00:00:00 2001
From: igeligel <kevinigeligeligel@gmail.com>
Date: Mon, 24 Oct 2016 15:33:25 +0200
Subject: [PATCH] Fix pom.xml

---
 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 598386753..fc68a3830 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,13 +132,10 @@
         <module>aggregator-microservices</module>
         <module>promise</module>
         <module>page-object</module>
-<<<<<<< HEAD
+        <module>event-asynchronous</module>
         <module>object-mother</module>
     </modules>
-=======
-        <module>event-asynchronous</module>
 	</modules>
->>>>>>> refs/remotes/iluwatar/master
 
     <dependencyManagement>
         <dependencies>