resolved merge conflict
[jalview.git] / test / jalview / structure / AtomSpecTest.java
2017-04-28 gmungocJAL-2434 use a constant for StructureMapping.NO_CHAIN...
2016-11-14 gmungocJAL-2296 parse Chimera atomspec to AtomSpec