Commit adf2478e authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie
Browse files

Mergey merge?

parent 6dd58a25
......@@ -59,7 +59,6 @@ abstract class Auth {
/**
* Given a username, returns a hash of information about a user.
*
<<<<<<< HEAD/htdocs/lib/auth.php
* Should throw an exception if the authentication method doesn't know
* about the user, since this method should only be called after a
* successful authentication method (so we know the user exists)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment