Fix the gradle.properties

Sorry! :(
dmvk · Jun 28, 2017 · 70478b4 · 70478b4
1 parent 54524dc
commit 70478b4
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=256m -Dfile.encoding=UTF-8
-=======
-org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=128m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
->>>>>>> Stashed changes
+org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8