fix travis CI

2015-04-04 11:21:27 +08:00 · 2015-04-04 11:21:27 +08:00 · ee37e10382
commit ee37e10382
parent 68f02c12d1
1 changed files with 2 additions and 1 deletions
--- a/pom.xml
+++ b/pom.xml
@ -41,8 +41,9 @@
 		<module>null-object</module>
 		<module>event-aggregator</module>
 		<module>callback</module>
-		<module>intercepting-filter</module>
 <<<<<<< HEAD
+		
+		<module>intercepting-filter</module>
  </modules>
 =======
 		<module>execute-around</module>