From: hansonr <hansonr@stolaf.edu>
Date: Fri, 24 Jul 2015 11:26:12 +0000 (+0100)
Subject: JAL-1807 conflict test
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1b86961f16b88c6b571a3874ef95db034cd6f52b;hp=c796f79e307d86cbfa348cd0ec486deacc9ea2cd;p=jalviewjs.git

JAL-1807 conflict test
---

diff --git a/src/fr/orsay/lri/varna/models/rna/RNA.java b/src/fr/orsay/lri/varna/models/rna/RNA.java
index 531c1e1..11fae1e 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
+ * no significant reference in applet? test 2 Bob changes
  * 
  * @author Bob Hanson
  *