This should auto-fix merge conflicts when they occur on the Bindings.cpp / Bindings.h files. http://forum.mc-server.org/showthread.php?tid=1200&pid=9315#pid9315
438 B
438 B
This should auto-fix merge conflicts when they occur on the Bindings.cpp / Bindings.h files. http://forum.mc-server.org/showthread.php?tid=1200&pid=9315#pid9315