Ive been unable to commit this since 9am, somehow port 22 is unusable at work now...

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5639 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index 93820390dbd4a3c0c218fd3fd268445bfee84085..828f167b2f24dee116c0f8d7021ce588eefed7b6 100644 (file)
--- 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
                }
        }