Merge remote-tracking branch 'origin/master'

# Conflicts: # RestEasy Example/src/main/java/com/baeldung/model/Movie.java
2016-02-13 23:37:13 +01:00 · 2016-02-13 23:37:13 +01:00 · 283a02a9c5
parent 81f4984071 d362112a31
commit 283a02a9c5
1 changed files with 0 additions and 1 deletions
--- a/Example/src/main/java/com/baeldung/model/Movie.java
+++ b/Example/src/main/java/com/baeldung/model/Movie.java
@ -29,7 +29,6 @@ public class Movie {
    protected String writer;
    protected String year;

-
    public String getActors() {
        return actors;
    }