Merge branch 'bug/JAL-2621' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 15:22:40 +0000 (15:22 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 5 Mar 2019 15:22:40 +0000 (15:22 +0000)
Conflicts:
src/jalview/gui/OverviewPanel.java

1  2 
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/OverviewPanel.java

Simple merge