From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 14 Nov 2014 16:08:37 +0000 (+0000)
Subject: git conflict resolution
X-Git-Tag: Jalview_2_9~152^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=49b7ceb43a431220124af095af5d705715d8ec8b;p=jalview.git

git conflict resolution
---

49b7ceb43a431220124af095af5d705715d8ec8b
diff --cc resources/templates/BioJSTemplate.txt
index af0e4d2,74990ad..bf780bb
--- a/resources/templates/BioJSTemplate.txt
+++ b/resources/templates/BioJSTemplate.txt
@@@ -50,16 -50,21 +50,22 @@@ function openJalviewUsingCurrentUrl()
    	var myForm = document.createElement("form");
    	myForm.action = url;
    	
-     var myInput = document.createElement("input") ;
-     myInput.setAttribute("name", "jvm-max-heap") ;
-     myInput.setAttribute("value", "2G");
-     myForm.appendChild(myInput) ;
+     var heap = document.createElement("input") ;
+     heap.setAttribute("name", "jvm-max-heap") ;
+     heap.setAttribute("value", "2G");
+     myForm.appendChild(heap) ;
+     
+     var target = document.createElement("input") ;
+     target.setAttribute("name", "open") ;
+     target.setAttribute("value", document.URL);
+     myForm.appendChild(target) ;
+     
+     var jvVersion = document.createElement("input") ;
+     jvVersion.setAttribute("name", "version") ;
+     jvVersion.setAttribute("value", jalviewVersion);
+     myForm.appendChild(jvVersion) ;
      
-     var myInput1 = document.createElement("input") ;
-     myInput1.setAttribute("name", "open") ;
-     myInput1.setAttribute("value", document.URL);
-     myForm.appendChild(myInput1) ;    
 +
    	document.body.appendChild(myForm) ;
    	myForm.submit() ;
    	document.body.removeChild(myForm) ;