From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 14 Nov 2017 08:44:08 +0000 (+0000)
Subject: JAL-2754 corrected merge conflict
X-Git-Tag: Release_2_11_0~135
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ce01e81a28859edbdaaaea0e25b13de75ec2e88d;p=jalview.git

JAL-2754 corrected merge conflict
---

diff --git a/build.xml b/build.xml
index 43d6a0c..89c3d24 100755
--- a/build.xml
+++ b/build.xml
@@ -451,7 +451,7 @@
 
     <jnlpf toFile="${jnlpFile}" />
     <!-- add the add-modules j2se attribute for java 9 -->
-    <replace file="${jnlpFile}" value="j2se version=&quot;1.9+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee --illegal-access=warn&quot;">
+    <replace file="${jnlpFile}" value="j2se version=&quot;1.8+&quot; initial-heap-size=&quot;${inih}&quot; max-heap-size=&quot;${maxh}&quot; java-vm-args=&quot;--add-modules=java.se.ee --illegal-access=warn&quot;">
           <replacetoken>j2se version="1.8+"</replacetoken>
     </replace>
   </target>