Merge branch 'task/JAL-3763_newDatasetForCds' into merge/develop_task/JAL-3763_newDat...
authorJim Procter <j.procter@dundee.ac.uk>
Wed, 26 Jan 2022 19:36:23 +0000 (19:36 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Wed, 26 Jan 2022 19:36:23 +0000 (19:36 +0000)
commit27aed96d1aeae689818bd0a0028553186e3c3839
treef3313890902b4ea162144c05adf8e88775c56900
parent7312fed439c2a32de989c6f5155203ebc0a7f854
parent3af9017e1f6c6d045c6c0d41245fcd7bfdae32a6
Merge branch 'task/JAL-3763_newDatasetForCds' into merge/develop_task/JAL-3763_newDatasetForCds

 Conflicts:
src/jalview/analysis/AlignmentUtils.java
src/jalview/util/MapList.java
test/jalview/util/MapListTest.java
test/jalview/util/MappingUtilsTest.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/datamodel/SearchResults.java
src/jalview/gui/PopupMenu.java
src/jalview/util/MappingUtils.java
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
test/jalview/util/MapListTest.java
test/jalview/util/MappingUtilsTest.java