From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 24 Jul 2015 11:25:36 +0000 (+0100)
Subject: This should be a really annoying conflict\!
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c66a527bdc63eb79e66a9f2afb8371fb28b82054;p=jalviewjs.git

This should be a really annoying conflict\!
---

diff --git a/src/fr/orsay/lri/varna/models/rna/RNA.java b/src/fr/orsay/lri/varna/models/rna/RNA.java
index 531c1e1..e1ad675 100644
--- a/src/fr/orsay/lri/varna/models/rna/RNA.java
+++ b/src/fr/orsay/lri/varna/models/rna/RNA.java
@@ -3,19 +3,20 @@ package fr.orsay.lri.varna.models.rna;
 /**
  * no significant reference in applet? test 2
  * 
+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;
 	}
-
+// the place
 }