Merge remote-tracking branch 'remotes/origin/splitIntoTwoModules' into NetworkedVisualiser

# Conflicts:
#	visualiser/src/main/java/seng302/VisualiserInput.java
This commit is contained in:
cbt24
2017-05-01 16:00:11 +12:00
parent b1db9ee5be
commit 3f42d56502
3 changed files with 5 additions and 17 deletions
@@ -49,8 +49,4 @@ public class StreamedBoat extends Boat {
}
return azimuth;
}
public int getSourceID() {
return sourceID;
}
}