merged master fixed conflict

2015-04-04 05:46:19 +08:00
parent 6d4e47311a 46a6ff2894
commit ddace113eb
18 changed files with 468 additions and 2 deletions
--- a/pom.xml
+++ b/pom.xml
@ -41,8 +41,14 @@
 		<module>null-object</module>
 		<module>event-aggregator</module>
 		<module>callback</module>
+<<<<<<< HEAD
 		<module>intercepting-filter</module>
  </modules>
+=======
+		<module>execute-around</module>
+		<module>property</module>
+	</modules>
+>>>>>>> origin/master

 	<dependencyManagement>
 		<dependencies>