JAL-1807

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;
 
 /**
- * no significant reference in applet?
+ * jsapplet?yes! test 2 Bob changes
  * 
+lots of changes
  * @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) {
-               // TODO Auto-generated method stub
+       //over  // 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;
-       }
-
+// the place
 }
->>>>>>> branch 'master' of https://source.jalview.org/git/jalviewjs.git