Fixed merge error.
commit5fc22cd89f2719c8f11f9d2880c69fdf53c3c77e
authortomrus88 <tomrus88@gmail.com>
Sun, 10 Jan 2010 09:47:53 +0000 (10 12:47 +0300)
committertomrus88 <tomrus88@gmail.com>
Sun, 10 Jan 2010 09:47:53 +0000 (10 12:47 +0300)
treefcda9ac8e35e746945bacb91bf047f3d35a819e0
parent7e087c9db9d470a4a1bc721d21e15f28769c0b5e
Fixed merge error.
src/game/ObjectMgr.h