From 5fbc56cfc2c0db85353ae898bea8e8d83d7b480c Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Wed, 8 Apr 2009 17:05:58 +0000
Subject: [PATCH] Fixed another merge error.

---
 src/net/common/serverlobbythread.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index 67175d46..d0544665 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -1393,6 +1393,8 @@ ServerLobbyThread::IsPlayerBanned(const std::string &name) const
 		}
 		++i;
 	}
+
+	return retVal;
 }
 
 boost::shared_ptr<NetPacket>