nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of bitbucket.org:kitsushadow/forgecraft

Browse Source 
Conflicts:
	.gradle/2.0/taskArtifacts/cache.properties.lock
	.gradle/2.0/taskArtifacts/fileHashes.bin
	.gradle/2.0/taskArtifacts/fileSnapshots.bin
	.gradle/2.0/taskArtifacts/taskArtifacts.bin
	.gradle/gradle.log
This commit is contained in:
KitsuShadow
2015-07-15 22:54:12 -04:00
parent 8cfae34b12 16825054b0
commit af43ac470b
3 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gradle/gradle.log
View File

@@ -34,4 +34,8 @@ Note: Recompile with -Xlint:unchecked for details.
BUILD SUCCESSFUL
<<<<<<< HEAD
Total time: 9.983 secs
=======
Total time: 13.559 secs
>>>>>>> 16825054b0ee5f4bff3059db84297822fc100352