From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 7 Jun 2019 08:37:53 +0000 (+0100)
Subject: commit to enable merge
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=775e7bc104584e88dddcea73fbf02c66f5200c16;p=jalview.git

commit to enable merge
---

diff --git a/.settings/org.eclipse.jdt.groovy.core.prefs b/.settings/org.eclipse.jdt.groovy.core.prefs
new file mode 100644
index 0000000..74af1ba
--- /dev/null
+++ b/.settings/org.eclipse.jdt.groovy.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.compiler.level=25