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

Conflicts: dao/pom.xml
2015-10-19 20:44:46 +03:00
parent 9cbc4a20b9 d0af12b1ee
commit 339db2a0bf
11 changed files with 358 additions and 167 deletions
--- a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java
+++ b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AppTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;

 public class AppTest {

-	private App app = new App();;
+	private App app = new App();
 	private KingdomFactory elfFactory;
 	private KingdomFactory orcFactory;