JAL-2851 Fix merge error breaking vertical scrolling
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 23 Nov 2017 11:50:39 +0000 (11:50 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 23 Nov 2017 11:50:39 +0000 (11:50 +0000)
commit07033e7dfaeaa1a51cc7ab37bd9b7d3ee0b6862a
treeb529ab561898e47836942bc8e9fbc9f0ad2a8a3b
parent657ebfc85b968d91f400923f821df27e87a76c1f
JAL-2851 Fix merge error breaking vertical scrolling
src/jalview/gui/SeqCanvas.java