Fixed another merge error. · 5fbc56cfc2 - pokerth - SnakesHub

sco/pokerth

Fixed another merge error.

This commit is contained in:

lotodore

2009-04-08 17:05:58 +00:00

parent a3a7a7879e

commit 5fbc56cfc2

1 changed files with 2 additions and 0 deletions

									
										src/net/common/serverlobbythread.cpp
									
		+2
		
												View File
												
					@@ -1393,6 +1393,8 @@ ServerLobbyThread::IsPlayerBanned(const std::string &name) const

							}

							}

							++i;

							++i;

						}

						}

						return retVal;

					}

					}

					boost::shared_ptr<NetPacket>

					boost::shared_ptr<NetPacket>