From 252301f34d8acd8f527163d5ba6bdc1cf3fda401 Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 3 Nov 2006 16:53:45 +0000 Subject: Ive been unable to commit this since 9am, somehow port 22 is unusable at work now, even though we need to use it... damn cable and witless. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5639 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/extra/m_sqloper.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/modules/extra') diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp index 93820390d..828f167b2 100644 --- a/src/modules/extra/m_sqloper.cpp +++ b/src/modules/extra/m_sqloper.cpp @@ -68,7 +68,6 @@ public: { if ((result == CMD_FAILURE) && (command == "OPER")) { -<<<<<<< .mine if (LookupOper(user, parameters[0], parameters[1])) { /* Returning true here just means the query is in progress, or on it's way to being @@ -78,9 +77,6 @@ public: */ return 1; } -======= - LookupOper(user, parameters[0], parameters[1]); ->>>>>>> .r5635 } } -- cgit v1.2.3