groovy git commit: Fix merge issue

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 issue

cchampeau
Repository: groovy
Updated Branches:
  refs/heads/master dfd30db7d -> 6c4fa9232


Fix merge issue


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

Branch: refs/heads/master
Commit: 6c4fa92328f48c9a0e2c85c4a26e65000dbd1088
Parents: dfd30db
Author: Cedric Champeau <[hidden email]>
Authored: Fri Jun 16 11:52:33 2017 +0200
Committer: Cedric Champeau <[hidden email]>
Committed: Fri Jun 16 11:52:33 2017 +0200

----------------------------------------------------------------------
 gradle/wrapper/gradle-wrapper.jar        | Bin 54783 -> 54706 bytes
 gradle/wrapper/gradle-wrapper.properties |  10 +---------
 2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/6c4fa923/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cb20deb..49a9eb7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/groovy/blob/6c4fa923/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 02171eb..60a418c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,14 +1,6 @@
-<<<<<<< Updated upstream
-#Fri Jun 16 08:33:40 CST 2017
-=======
-#Fri Jun 16 11:19:26 CEST 2017
->>>>>>> Stashed changes
+#Fri Jun 16 11:52:18 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-<<<<<<< Updated upstream
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
-=======
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
->>>>>>> Stashed changes

Loading...