Skip to content

Commit 74ac79b

Browse files
committed
Fix pom.xml
1 parent 750fa4f commit 74ac79b

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,10 @@
132132
<module>aggregator-microservices</module>
133133
<module>promise</module>
134134
<module>page-object</module>
135-
<<<<<<< HEAD
135+
<module>event-asynchronous</module>
136136
<module>object-mother</module>
137137
</modules>
138-
=======
139-
<module>event-asynchronous</module>
140138
</modules>
141-
>>>>>>> refs/remotes/iluwatar/master
142139

143140
<dependencyManagement>
144141
<dependencies>

0 commit comments

Comments
 (0)