groovy git commit: fix merge glitch

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

groovy git commit: fix merge glitch

paulk
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_5_X 20bb8421a -> 177c77edb


fix merge glitch


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/177c77ed
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/177c77ed
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/177c77ed

Branch: refs/heads/GROOVY_2_5_X
Commit: 177c77edb862bf4a913330ba0879144e9053de17
Parents: 20bb842
Author: paulk <[hidden email]>
Authored: Mon Jun 19 20:45:13 2017 +1000
Committer: paulk <[hidden email]>
Committed: Mon Jun 19 20:45:13 2017 +1000

----------------------------------------------------------------------
 build.gradle | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/177c77ed/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 08a4a80..7e3b58e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,11 +60,7 @@ buildScan {
 }
 
 ext.modules = {
-<<<<<<< HEAD
-    subprojects.findAll{ !['performance'].contains(it.name) }
-=======
     subprojects.findAll{ !['performance', 'tests-vm8'].contains(it.name) }
->>>>>>> 27c7205... rename subproject to better reflect that it isn't a normal module
 }
 
 apply from: 'gradle/filter.gradle'

Loading...