fix travis CI

2015-04-04 11:28:42 +08:00 · 2015-04-04 11:28:42 +08:00 · 5383eb9f56
commit 5383eb9f56
parent ee37e10382
1 changed files with 2 additions and 6 deletions
--- a/pom.xml
+++ b/pom.xml
@ -41,15 +41,11 @@
 		<module>null-object</module>
 		<module>event-aggregator</module>
 		<module>callback</module>
-<<<<<<< HEAD
+		<module>execute-around</module>
+		<module>property</module>
 		
 		<module>intercepting-filter</module>
 	</modules>
-=======
-		<module>execute-around</module>
-		<module>property</module>
-	</modules>
->>>>>>> origin/master

 	<dependencyManagement>
 		<dependencies>