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

diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index 8def1e8d3e02cd85821503bd20adefd00b4561a5..9eab3d167f8b62cc2e39aa022db8b07ba267fdce 100644 (file)
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -15,7 +15,6 @@
  */
 
 #include <string>
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -24,7 +23,6 @@
 
 #include "m_sqlv2.h"
 #include "m_sqlutils.h"
-#include "commands/cmd_oper.h"
 
 /* $ModDesc: Allows storage of oper credentials in an SQL table */