[groovy] branch GROOVY_3_0_X updated: fix merge glitch

Previous Topic Next Topic
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

[groovy] branch GROOVY_3_0_X updated: fix merge glitch

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new 575f913  fix merge glitch
575f913 is described below

commit 575f9136535ee5424a9804c8a40257822c043ace
Author: Paul King <[hidden email]>
AuthorDate: Fri Nov 20 17:37:26 2020 +1000

    fix merge glitch
 src/test/groovy/transform/stc/GenericsSTCTest.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/groovy/transform/stc/GenericsSTCTest.groovy b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
index 414247f..6dbbb44 100644
--- a/src/test/groovy/transform/stc/GenericsSTCTest.groovy
+++ b/src/test/groovy/transform/stc/GenericsSTCTest.groovy
@@ -20,6 +20,7 @@ package groovy.transform.stc
 import groovy.test.NotYetImplemented
 import org.codehaus.groovy.antlr.AntlrParserPluginFactory
+import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
  * Unit tests for static type checking : generics.