Merge branch 'feature/JAL-3169cancelOverwrite' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 10 Dec 2018 13:55:12 +0000 (13:55 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 10 Dec 2018 13:55:12 +0000 (13:55 +0000)
commit903973eeb7485c38e32002d926de1e06bf29bc94
treebb9d7b40ffb2887e6998241efe09274d8018d411
parenta4aa14220a6a53391ca8e171bc774cef908057a3
parentd7527de9d963ee1869b0c7545be3d9213cdd0c6d
Merge branch 'feature/JAL-3169cancelOverwrite' into
JAL-3048dialogRunner2

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