git://source.jalview.org / jalviewjs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c796f79)
JAL-1807 conflict test
authorhansonr <hansonr@stolaf.edu>
Fri, 24 Jul 2015 11:26:12 +0000 (12:26 +0100)
committerhansonr <hansonr@stolaf.edu>
Fri, 24 Jul 2015 11:26:12 +0000 (12:26 +0100)
src/fr/orsay/lri/varna/models/rna/RNA.java patch | blob | history

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 (file)
--- 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
  *