JAL-3377 fix up failed merge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jul 2019 11:16:50 +0000 (12:16 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jul 2019 11:16:50 +0000 (12:16 +0100)
commitfea581c3bd5638ab263bb26936797cfa00461159
tree2d545c7ae6a09ffb57e49888fa45f93e9aaa3018
parent57d09c9fd0882ffa5e1ef1773fec2250923c0540
JAL-3377 fix up failed merge
src/jalview/gui/IdCanvas.java