Merge branch 'master' of https://github.com/iluwatar/java-design-patterns

# Conflicts: # pom.xml
2018-07-08 23:09:55 +05:30
parent 328f917749 d915b66e70
commit fc87f8b7d3
31 changed files with 1581 additions and 3 deletions
--- a/pom.xml
+++ b/pom.xml
@ -161,9 +161,8 @@
        <module>dirty-flag</module>
        <module>trampoline</module>
        <module>serverless</module>
-	    <module>component-object</module>
-	    <module>monitor-object</module>
-	    <module>collection-pipeline</module>
+        <module>ambassador</module>
+	<module>acyclic-visitor</module>
    </modules>

    <repositories>