From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 15 Jul 2019 12:18:29 +0000 (+0100)
Subject: Update to match develop to allow merge
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~128
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e6267883ffc25d76313c9e45967efe2c9e6d1d08;hp=77fe5f2b4f597d9b872c44938af8ee6b003041d2;p=jalview.git

Update to match develop to allow 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