*Fix a typo in 3806 that makes players item is mailed back.

*Also a missing part of last rev.

--HG--
branch : trunk

1 files changed, 0 insertions, 5 deletions

diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index 72fa626fdcb..c60d368659a 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -823,13 +823,8 @@ void WorldSession::HandleStableSwapPet( WorldPacket & recv_data )
     _player->RemovePet(pet,pet->isAlive() ? PetSaveMode(slot) : PET_SAVE_AS_DELETED);
 
     // summon unstabled pet
-<<<<<<< HEAD:src/game/NPCHandler.cpp
     Pet *newpet = new Pet(_player);
-    if(!newpet->LoadPetFromDB(_player,petentry,pet_number))
-=======
-    Pet *newpet = new Pet;
     if(!newpet->LoadPetFromDB(_player,creature_id,pet_number))
->>>>>>> b8ce292c7048fb8c4e4a06971c3859efe2421f28:src/game/NPCHandler.cpp
     {
         delete newpet;
         data << uint8(0x06);