You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2017/12/17 15:05:24 UTC
[62/62] [abbrv] groovy git commit: Fix merge conflict
Fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/32a94adb
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/32a94adb
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/32a94adb
Branch: refs/heads/GROOVY_2_5_X
Commit: 32a94adb249724c02c023bef449bf58b3d679ba7
Parents: fef7beb
Author: Cedric Champeau <cc...@apache.org>
Authored: Sun Dec 17 15:37:48 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sun Dec 17 15:37:48 2017 +0100
----------------------------------------------------------------------
build.gradle | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/32a94adb/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4fda6b5..de6ba3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,6 @@ ext.modules = {
}
ext.isReleaseVersion = !groovyVersion.toLowerCase().endsWith("snapshot")
-apply from: 'gradle/filter.gradle'
apply from: 'gradle/indy.gradle'
apply from: 'gradle/publish.gradle'
apply plugin: 'javadocHotfix'