Fix error from merging

Vectron · Jan 28, 2016 · 374557b · 374557b
1 parent 432e20f
commit 374557b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 1 deletion.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,4 @@
 #Mon Sep 14 12:28:28 PDT 2015
->>>>>>> refs/heads/1.8.9
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME