From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 1 May 2017 14:16:24 +0000 (+0100)
Subject: resolved merge conflict
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8feb5f87bd94e5d49c9dbc5fd7ec7e866ef80e9d;p=jalview.git

resolved merge conflict
---

8feb5f87bd94e5d49c9dbc5fd7ec7e866ef80e9d