Fix pom.xml

2016-10-24 15:33:25 +02:00
parent 750fa4f954
commit 74ac79b01e
1 changed files with 1 additions and 4 deletions
--- 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>