Hmm, svn said there was a conflict here, but nobody had committed :/

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5637 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2006-11-03 08:33:18 +00:00
parent 4c19dfeed8
commit 7abfe8295a

View File

@ -15,7 +15,6 @@
*/ */
#include <string> #include <string>
#include "users.h" #include "users.h"
#include "channels.h" #include "channels.h"
#include "modules.h" #include "modules.h"
@ -24,7 +23,6 @@
#include "m_sqlv2.h" #include "m_sqlv2.h"
#include "m_sqlutils.h" #include "m_sqlutils.h"
#include "commands/cmd_oper.h"
/* $ModDesc: Allows storage of oper credentials in an SQL table */ /* $ModDesc: Allows storage of oper credentials in an SQL table */