JAL-3066 remove git conflict file
[jalview.git] / unused / AlignmentAnnotation.java
2019-01-29 hansonrexperiment using a register buffer instead of creating...