From e17af4b0982164eabff2d10ebb527a2125cd036a Mon Sep 17 00:00:00 2001
From: Carbenium <carbenium@outlook.com>
Date: Tue, 21 Jul 2015 19:11:36 +0200
Subject: [PATCH] Fix merge fail

---
 src/server/game/DungeonFinding/LFGMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 674f718009f..1d0af0eed55 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -767,7 +767,7 @@ void LFGMgr::GetCompatibleDungeons(LfgDungeonSet& dungeons, GuidSet const& playe
                 bool eraseDungeon = true;
 
                 // Don't remove the dungeon if team members are trying to continue a locked instance
-                if (it2->second == LFG_LOCKSTATUS_RAID_LOCKED && isContinue)
+                if (it2->second.lockStatus == LFG_LOCKSTATUS_RAID_LOCKED && isContinue)
                 {
                     LFGDungeonData const* dungeon = GetLFGDungeon(dungeonId);
                     ASSERT(dungeon);