git://source.jalview.org
/
jalviewjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
JAL-1807 conflict test
[jalviewjs.git]
/
src
/
fr
/
orsay
/
lri
/
varna
/
models
/
rna
/
RNA.java
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
*