From 5383eb9f56a4fc40ec4ff85b322682b2af88f05d Mon Sep 17 00:00:00 2001
From: Josh <joshua.zambales@obf.ateneo.edu>
Date: Sat, 4 Apr 2015 11:28:42 +0800
Subject: [PATCH] fix travis CI

---
 pom.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2928df18f..d61129e9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,15 +41,11 @@
 		<module>null-object</module>
 		<module>event-aggregator</module>
 		<module>callback</module>
-<<<<<<< HEAD
-		
-		<module>intercepting-filter</module>
-  </modules>
-=======
 		<module>execute-around</module>
 		<module>property</module>
+		
+		<module>intercepting-filter</module>
 	</modules>
->>>>>>> origin/master
 
 	<dependencyManagement>
 		<dependencies>