Merge branch 'patch/JAL-2446_mergeconflictmissed' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 9 Oct 2017 13:47:00 +0000 (14:47 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 9 Oct 2017 13:47:00 +0000 (14:47 +0100)
commit2f7a43c60eb2bbbb907240c6320ab11d41227c02
treed9d8f9719725e524b47a76cc1b8c28d8835525cc
parentf03d38921ade47337d3180b8b2aefcd0009bcf29
parentf3809a56dd27cd423fc114371aeab3faf9576953
Merge branch 'patch/JAL-2446_mergeconflictmissed' into develop