resolved merge conflict
[jalview.git] / examples / estrogenReceptorProtein.aln
2015-09-09 Jim ProcterJAL-1684 aligned proteins and citation for for Estrogen...