JAL-2774 Fixed merge issues
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 31 Oct 2017 14:24:54 +0000 (14:24 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 31 Oct 2017 14:24:54 +0000 (14:24 +0000)
commit42a3c5add84dd6d89be5efb6cbcef72d38c1132c
tree2e3553c4f2449d0250999f06a5b7bb900029750b
parentc78840385a5ac9dd6d16a37aa7b55cfaeb360456
JAL-2774 Fixed merge issues
src/jalview/gui/SeqCanvas.java