Cleanup some merge conflicts

This commit is contained in:
ebaydayz
2016-03-04 14:29:49 -05:00
parent 61c64cb14a
commit 732c2fe5a0
8 changed files with 10 additions and 57 deletions

View File

@@ -3,6 +3,8 @@
Please request permission to use/alter from ziellos2k.
Edited by Alby with permission from ziellos2k.
Included in Epoch with permission by @ebaydayz
*/
disableSerialization;