iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	RestEasy Example/src/main/java/com/baeldung/model/Movie.java
This commit is contained in:
Giuseppe Bueti 2016-02-13 23:37:13 +01:00
parent 81f4984071 d362112a31
commit 283a02a9c5
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RestEasy Example/src/main/java/com/baeldung/model/Movie.java
View File

@ -29,7 +29,6 @@ public class Movie {
protected String writer; protected String writer;
protected String year; protected String year;
public String getActors() { public String getActors() {
return actors; return actors;
} }