resolved merge conflict
[jalview.git] / src / jalview / structure / StructureMappingClient.java
2017-05-01 gmungocJAL-2434 omit unmapped positions from mapping
2017-01-20 tcofoegbuJAL-2375 JAL-2376 First commit of implementation for...