hmmm. leftofer notation from a merge. looks harmless

git-svn-id: http://svn.tabris.net/repos/srsv@3533 70d4eda1-72e9-0310-a436-91e5bd24443c

diff --git a/branches/0.5.0/modules/serviceslibs/nickserv.pm b/branches/0.5.0/modules/serviceslibs/nickserv.pm
index 3b8e0a932b78a4d8ba160af681716d02ebd52eec..cbaacd1d92b193b040f959cdcd5e16c0f053309a 100644 (file)
--- a/branches/0.5.0/modules/serviceslibs/nickserv.pm
+++ b/branches/0.5.0/modules/serviceslibs/nickserv.pm
@@ -2604,7 +2604,6 @@ sub do_identify ($$$;$$) {
 
        memoserv::notify($user, $root);
        notify_auths($user, $root) if $flags & NRF_AUTH;
->>>>>>> .merge-right.r3531
        return ($enforced ? 2 : 1);
 }