JAL-3127 fix faulty merge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 15:36:36 +0000 (15:36 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 15:36:36 +0000 (15:36 +0000)
commit1cf39accd3b4acfe0f02ff8100c936c4dbaeee1e
tree24baf8b1293919b43c886e6cc59f2b5dfd655bea
parent8aa94d348698138bb5c30715ef0aa15349f47fbb
JAL-3127 fix faulty merge
test/jalview/project/Jalview2xmlTests.java