From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 7 Mar 2017 10:00:37 +0000 (+0000)
Subject: JAL-2429 Messed something up, merged conflicts
X-Git-Tag: Release_2_10_2~3^2~92^2~50
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=366b1c4a421d8c8455668b06e24620c2101d8a4b;p=jalview.git

JAL-2429 Messed something up, merged conflicts
---

366b1c4a421d8c8455668b06e24620c2101d8a4b