JAL-3141 fix up merge artefact so BackupFilesTest passes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 13 Mar 2019 10:50:39 +0000 (10:50 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 13 Mar 2019 10:50:39 +0000 (10:50 +0000)
commit116c74a028f628d907dd82a4d763498042f55a5b
tree18c48079e9e44d1eb186868fd3a98bb58819c583
parent3da878124135ff033f42d19d8733891b09e953cd
JAL-3141 fix up merge artefact so BackupFilesTest passes
src/jalview/gui/AlignFrame.java