From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 24 Jul 2015 11:36:16 +0000 (+0100)
Subject: true conflict\!
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c91f18fbea07443d0331f6e3f340ee11209f2dc8;p=jalviewjs.git

true conflict\!
---

diff --git a/src/fr/orsay/lri/varna/models/rna/RNA.java b/src/fr/orsay/lri/varna/models/rna/RNA.java
index b34aa2f..d72bb20 100644
--- a/src/fr/orsay/lri/varna/models/rna/RNA.java
+++ b/src/fr/orsay/lri/varna/models/rna/RNA.java
@@ -1,7 +1,7 @@
 package fr.orsay.lri.varna.models.rna;
 
 /**
- * no significant reference in applet? test 2 Bob changes
+ * jsapplet?yes! test 2 Bob changes
  * 
 lots of changes
  * @author Bob Hanson