Merge branch 'bug/JAL-3120restoreFeatureColour' into merge/JAL-3120
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 10:54:27 +0000 (10:54 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 4 Mar 2019 10:54:27 +0000 (10:54 +0000)
commit3c8a25936a2d805e7e3d7ab82f83b13135406d18
tree4757315a76094220f751f4527501f5b1acd7924b
parent09d3b755d9b00f5c3acb44049aedd49361dc0690
parente42eed3a0089a8a064560df4cf17a5021fd1e16a
Merge branch 'bug/JAL-3120restoreFeatureColour' into merge/JAL-3120

Conflicts:
src/jalview/gui/Jalview2XML.java
test/jalview/io/Jalview2xmlTests.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/project/Jalview2XML.java
src/jalview/schemes/FeatureColour.java
src/jalview/workers/ConsensusThread.java
test/jalview/gui/AlignFrameTest.java
test/jalview/io/FeaturesFileTest.java
test/jalview/project/Jalview2xmlTests.java
test/jalview/renderer/seqfeatures/FeatureRendererTest.java
test/jalview/schemes/FeatureColourTest.java