This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 947a0e50fc7e386993802b51f3143cc30ce926db Merge: 055a3bf 914c14f Author: Paul King <pa...@asert.com.au> AuthorDate: Tue May 14 15:02:36 2019 +1000 Split history main/java/org/codehaus/groovy/runtime/ScriptTestAdapter.java to main/java/org/apache/groovy/test - resolve conflict and keep both files .../org/apache/groovy/test/ScriptTestAdapter.java | 55 ++++++++++++++++++++++ .../NotYetImplementedASTTransformation.java | 4 +- .../NotYetImplementedTransformTest.groovy | 2 +- 3 files changed, 59 insertions(+), 2 deletions(-)