Merge branch 'spikes/mungo' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Feb 2018 09:54:10 +0000 (09:54 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Feb 2018 09:54:10 +0000 (09:54 +0000)
commit241bd0223b016b5ad5ec78520310a8de32842722
tree3abd5e090406db2643fa3ca85280ceac8c164d94
parent537da9c65518c52985308b67c499fe6a60a607ce
parent9214cffc006412ed194565b82c8663df2ea641c6
Merge branch 'spikes/mungo' into trialMerge

Conflicts:
src/jalview/analysis/AlignmentUtils.java
test/jalview/analysis/AlignmentUtilsTests.java
src/jalview/analysis/AlignmentUtils.java
test/jalview/analysis/AlignmentUtilsTests.java