Merge branch 'feature/JAL-3169cancelOverwrite' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Feb 2019 15:51:18 +0000 (15:51 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Feb 2019 15:51:18 +0000 (15:51 +0000)
commit0e96750ac13c49fe43f97d4929d2a5e4520eb141
treee62b919863ee83924e73a6a5ee7135622f0fa224
parent58d996e175bf8e2898f1ce9c4a71bcc5250d17d9
parentd7527de9d963ee1869b0c7545be3d9213cdd0c6d
Merge branch 'feature/JAL-3169cancelOverwrite' into develop

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