Merge branch 'feature/JAL-3169cancelOverwrite' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Dec 2018 16:45:11 +0000 (16:45 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Dec 2018 16:45:11 +0000 (16:45 +0000)
commit4b527101d4272edd16a94be664bc3b4761bbd185
treef33cbe7a1fe0affeb7a706ee7d5a66b82843f2bd
parentc543db8bc1a31098d2c3ce464d21401fb7ff390f
parentd7527de9d963ee1869b0c7545be3d9213cdd0c6d
Merge branch 'feature/JAL-3169cancelOverwrite' into trialMerge

Conflicts:
src/jalview/io/JalviewFileChooser.java
src/jalview/io/JalviewFileChooser.java