mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-21 12:09:43 +00:00
Final merging changes
This commit is contained in:
parent
aa7d6b12b5
commit
f1956464b0
2 changed files with 2 additions and 6 deletions
|
|
@ -40,8 +40,4 @@ define("CURRENT_VERSION", 1);
|
|||
define("LOG", true);
|
||||
define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78");
|
||||
define("TEST_MD5", "5ca8eced50a5801619f7ae86d631a4e7");
|
||||
<<<<<<< HEAD
|
||||
define("MAJOR_VERSION", "Alpha_1.0.2");
|
||||
=======
|
||||
define("MAJOR_VERSION", "Alpha_1.1");
|
||||
>>>>>>> Changed version to next release
|
||||
define("MAJOR_VERSION", "Alpha_1.0.2");
|
||||
Loading…
Add table
Add a link
Reference in a new issue