diff options
| author | Camil Staps | 2015-02-19 18:56:03 +0100 |
|---|---|---|
| committer | Camil Staps | 2015-02-19 18:56:03 +0100 |
| commit | d50ef7ea5930eae6fb79eef3c4753c3cf6b2908d (patch) | |
| tree | 61e1dc8501daa469caae9a970c99681aefc6c9c2 /GameController | |
| parent | directory structure (diff) | |
| parent | changed ant buildfile for default eclipse settings (diff) | |
Merge branch 'master' of https://github.com/camilstaps/Botleagues
Diffstat (limited to 'GameController')
| -rw-r--r-- | GameController/.gitignore | 1 | ||||
| -rw-r--r-- | GameController/src/nl/camilstaps/botleagues/GameController.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/GameController/.gitignore b/GameController/.gitignore index b630aee..5bda502 100644 --- a/GameController/.gitignore +++ b/GameController/.gitignore @@ -3,6 +3,7 @@ # Directories # /build/ /bin/ +/dist/ target/ # OS Files # diff --git a/GameController/src/nl/camilstaps/botleagues/GameController.java b/GameController/src/nl/camilstaps/botleagues/GameController.java index 77eea76..1054215 100644 --- a/GameController/src/nl/camilstaps/botleagues/GameController.java +++ b/GameController/src/nl/camilstaps/botleagues/GameController.java @@ -19,7 +19,7 @@ import java.util.List; public abstract class GameController { /** The contestants in this game */ - List<Contestant> contestants = new ArrayList<>(); + List<Contestant> contestants = new ArrayList<Contestant>(); /** * Add a new contestant |