From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 31 Oct 2017 14:24:54 +0000 (+0000)
Subject: JAL-2774 Fixed merge issues
X-Git-Tag: Release_2_10_4~67^2~19
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=42a3c5add84dd6d89be5efb6cbcef72d38c1132c;hp=42a3c5add84dd6d89be5efb6cbcef72d38c1132c;p=jalview.git

JAL-2774 Fixed merge issues
---