From 68f02c12d11525386dabbb0d220396d58e2130f6 Mon Sep 17 00:00:00 2001
From: Josh <joshua.zambales@obf.ateneo.edu>
Date: Sat, 4 Apr 2015 05:47:54 +0800
Subject: [PATCH] revised

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

diff --git a/pom.xml b/pom.xml
index 58cf19777..4e5b131c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,8 @@
 		<module>null-object</module>
 		<module>event-aggregator</module>
 		<module>callback</module>
-<<<<<<< HEAD
 		<module>intercepting-filter</module>
+<<<<<<< HEAD
   </modules>
 =======
 		<module>execute-around</module>