Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git

[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 589dc74..4891edc 100644 (file)
--- a/src/fr/orsay/lri/varna/models/rna/RNA.java
+++ b/src/fr/orsay/lri/varna/models/rna/RNA.java
@@ -1,3 +1,26 @@
+<<<<<<< HEAD
+package fr.orsay.lri.varna.models.rna;
+
+/**
+ * no significant reference in applet?
+ * 
+ * @author Bob Hanson
+ *
+ */
+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;
+       }
+
+}
+=======
 package fr.orsay.lri.varna.models.rna;
 
 /**
@@ -19,3 +42,4 @@ public class RNA {
        }
 
 }
+>>>>>>> branch 'master' of https://source.jalview.org/git/jalviewjs.git