Remove merge HEAD tag from gradlew properties

blair-robot-project · Mar 15, 2017 · d17f577 · d17f577
1 parent 352131a
commit d17f577
Showing 1 changed file with 0 additions and 4 deletions.
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