Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
adf2478e
Commit
adf2478e
authored
Oct 11, 2006
by
Nigel McNie
Committed by
Nigel McNie
Oct 11, 2006
Browse files
Mergey merge?
parent
6dd58a25
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/auth.php
View file @
adf2478e
...
...
@@ -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)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment