git://source.jalview.org
/
jalviewjs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9b7a35
)
JAL-1807
author
hansonr
<hansonr@stolaf.edu>
Fri, 24 Jul 2015 12:16:50 +0000
(13:16 +0100)
committer
hansonr
<hansonr@stolaf.edu>
Fri, 24 Jul 2015 12:16:50 +0000
(13:16 +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
4891edc
..
d72bb20
100644
(file)
--- a/
src/fr/orsay/lri/varna/models/rna/RNA.java
+++ b/
src/fr/orsay/lri/varna/models/rna/RNA.java
@@
-1,45
+1,22
@@
-<<<<<<< HEAD
package fr.orsay.lri.varna.models.rna;
/**
package fr.orsay.lri.varna.models.rna;
/**
- * no significant reference in applet?
+ * jsapplet?yes! test 2 Bob changes
*
*
+lots of changes
* @author Bob Hanson
*
*/
public class RNA {
public int getSize() {
* @author Bob Hanson
*
*/
public class RNA {
public int getSize() {
- // TODO Auto-generated method stub
+ // all // TODO Auto-generated method stub
return 0;
}
public String getStructDBN(boolean b) {
return 0;
}
public String getStructDBN(boolean b) {
- // TODO Auto-generated method stub
+ //over // TODO Auto-generated method stub
return null;
}
return null;
}
-
-}
-=======
-package fr.orsay.lri.varna.models.rna;
-
-/**
- * unused in applet?
- *
- *
- */
-
-public class RNA {
-
- public int getSize() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String getStructDBN(boolean b) {
- // TODO Auto-generated method stub
- return null;
- }
-
+// the place
}
}
->>>>>>> branch 'master' of https://source.jalview.org/git/jalviewjs.git