reconciled with develop
authorBobHanson <hansonr@stolaf.edu>
Wed, 8 Apr 2020 19:32:34 +0000 (14:32 -0500)
committerBobHanson <hansonr@stolaf.edu>
Wed, 8 Apr 2020 19:32:34 +0000 (14:32 -0500)
commit45b0738d718c18b5507f283b0d4be006594e816e
tree14bc6e3f3945d896b3db53eac877fd8439e01d19
parent3cafbe071e03ac84ac027f279b2299844388eda7
reconciled with develop
src/jalview/gui/FeatureTypeSettings.java
src/jalview/io/BackupFilenameParts.java
test/jalview/io/BackupFilesTest.java