From 5cf116d8a40d0e1d3663bf8ce5b87e0ea3eb2330 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 5 Dec 2015 20:32:18 +0000 Subject: [PATCH] Missed conflict when merging --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1088ee823..2fb47627b 100644 --- a/build.gradle +++ b/build.gradle @@ -175,11 +175,7 @@ artifacts { archives apiJar } -<<<<<<< HEAD -build.dependsOn javadocJar, deobfJar, apiJar -======= build.dependsOn sourceJar, deobfJar, apiJar ->>>>>>> master uploadArchives { repositories {