michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into 38b_LayLines

Browse Source 
# Conflicts:
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/Event.java
#	src/main/java/seng302/models/mark/Mark.java
#	src/main/java/seng302/models/stream/StreamParser.java
This commit is contained in:
Michael Rausch
2017-05-25 13:56:08 +12:00
parent e72ac1def8 adbb9ffe3b
commit af81bf5891
15 changed files with 248 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/models/stream/StreamReceiverTest.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class StreamReceiverTest {
byte[] emptyArray = {};
assert bytesToLong.invoke(streamReceiver, emptyArray).equals(0L);
} catch (Exception e){
System.out.println("");
e.printStackTrace();
}
}