true conflict\!
authorJim Procter <jprocter@issues.jalview.org>
Fri, 24 Jul 2015 11:36:16 +0000 (12:36 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 24 Jul 2015 11:36:16 +0000 (12:36 +0100)
commitc91f18fbea07443d0331f6e3f340ee11209f2dc8
treed0407b4e2961f075aff24d54ad0070f2085b752f
parente6b5abc063fa4f7c96022f72de4d5df3d6af7c40
true conflict\!
src/fr/orsay/lri/varna/models/rna/RNA.java