revised

2015-04-04 05:47:54 +08:00
parent ddace113eb
commit 68f02c12d1
1 changed files with 1 additions and 1 deletions
--- 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>