JAL-3210 merge conflict tidying
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 13 Mar 2019 15:54:42 +0000 (15:54 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 13 Mar 2019 15:54:42 +0000 (15:54 +0000)
commita4ea59821f1d72c3d4f91743d7b208d2559359ce
treeee6b567d3aee32c6b856d243acdfc2c0b5de70d3
parentbe135cc167b7374baa0ab0b18f31a3185389f59a
JAL-3210 merge conflict tidying
src/jalview/gui/AnnotationPanel.java
src/jalview/io/JalviewFileChooser.java