Remove merge HEAD tag from gradlew properties

rytse · web-flow · commit d17f5771643a · 2017-03-15T19:45:57.000-04:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 #Tue Mar 07 16:17:41 EST 2017
-=======
-#Sat Mar 04 12:31:48 EST 2017
->>>>>>> origin/commenting
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
