From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 11 Mar 2019 11:37:58 +0000 (+0000)
Subject: Merge branch 'feature/JAL-3127_seqidChainshading' into merge/JAL-3127
X-Git-Tag: Release_2_11_0~17^2~50
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=16d109024847af92482237e43f99b82fd997451a;hp=16d109024847af92482237e43f99b82fd997451a;p=jalview.git

Merge branch 'feature/JAL-3127_seqidChainshading' into merge/JAL-3127

Conflicts:
	src/jalview/gui/Jalview2XML.java
	src/jalview/gui/Jalview2XML_V1.java
	test/jalview/io/Jalview2xmlTests.java
---