Fixed the build properties.
This commit is contained in:
parent
888b488fea
commit
7b0f3f6e3c
|
@ -1,8 +1,5 @@
|
|||
<<<<<<< HEAD
|
||||
#
|
||||
#Thu Jun 04 17:28:17 EDT 2015
|
||||
=======
|
||||
>>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2
|
||||
mod_name=BloodMagic
|
||||
forge_version=10.13.4.1448-1.7.10
|
||||
ccc_version=1.0.4.29
|
||||
|
@ -14,7 +11,5 @@ mod_version=1.3.3
|
|||
minetweaker_version=Dev-1.7.10-3.0.9B
|
||||
build_number=5
|
||||
mc_version=1.7.10
|
||||
<<<<<<< HEAD
|
||||
build_number=5
|
||||
=======
|
||||
>>>>>>> ff8cf59bb8a81f12bb160df827bf73439e7855c2
|
||||
|
||||
|
|
Loading…
Reference in a new issue