maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Missed conflict when merging

Browse source
This commit is contained in:
modmuss50 2015-12-05 20:32:18 +00:00
parent 40f78c3938
commit 5cf116d8a4
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -175,11 +175,7 @@ artifacts {
archives apiJar
}
<<<<<<< HEAD
build.dependsOn javadocJar, deobfJar, apiJar
=======
build.dependsOn sourceJar, deobfJar, apiJar
>>>>>>> master
uploadArchives {
repositories {