revised

joshzambales · joshzambales · commit 68f02c12d115 · 2015-04-04T05:47:54.000+08:00
diff --git 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>
