JAL-1807 - Bob's last(?) before leaving Dundee -- adds fast file loading

[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 4891edc..2f6e5d7 100644 (file)
--- a/src/fr/orsay/lri/varna/models/rna/RNA.java
+++ b/src/fr/orsay/lri/varna/models/rna/RNA.java
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package fr.orsay.lri.varna.models.rna;
 
 /**
@@ -20,26 +19,3 @@ public class RNA {
        }
 
 }
-=======
-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