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 c16533d..4891edc 100644 (file)
--- a/src/fr/orsay/lri/varna/models/rna/RNA.java
+++ b/src/fr/orsay/lri/varna/models/rna/RNA.java
@@ -1,21 +1,45 @@
-package fr.orsay.lri.varna.models.rna;\r
-\r
-/**\r
- * no significant reference in applet?\r
- * \r
- * @author Bob Hanson\r
- *\r
- */\r
-public class RNA {\r
-\r
-       public int getSize() {\r
-               // TODO Auto-generated method stub\r
-               return 0;\r
-       }\r
-\r
-       public String getStructDBN(boolean b) {\r
-               // TODO Auto-generated method stub\r
-               return null;\r
-       }\r
-\r
-}\r
+<<<<<<< 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;
+
+/**
+ * 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;
+       }
+
+}
+>>>>>>> branch 'master' of https://source.jalview.org/git/jalviewjs.git