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

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4e5b131c5..2928df18f 100644
--- 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>