resolved conflict

Author: miho

gradle/project-info.gradle

@@ -3,7 +3,7 @@
 // -----------------------------------------------------------------------------
 ext.publishing.artifactId =  project.name.toLowerCase()
 ext.publishing.groupId    =  'eu.mihosoft.jcsg.ext.mesh'
-ext.publishing.versionId  =  '0.4-SNAPSHOT'
+ext.publishing.versionId  =  '0.4.2'
 
 ext.publishing.developerName         = 'Michael Hoffer'
 ext.publishing.developerAlias        = 'miho'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sat Feb 04 11:51:45 CET 2017
+#Sun Jun 25 11:33:23 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip