JAL-653 JAL-1766 merge 290b1 - fix erroneous conflicts on test asserts
authorJim Procter <jprocter@issues.jalview.org>
Thu, 15 Oct 2015 18:35:13 +0000 (19:35 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 15 Oct 2015 18:35:13 +0000 (19:35 +0100)
commitb95aa2c5c4b78241d21aafc18ef806b8171c36d1
tree184be851c6d311afefd4b37b82678ea925fbb119
parentc75ca41e87495a7d86ebc3c8cbeb56610ac48758
JAL-653 JAL-1766 merge 290b1 - fix erroneous conflicts on test asserts
test/jalview/io/AnnotatedPDBFileInputTest.java
test/jalview/io/Gff3tests.java