From: Andrew Garrett Date: Tue, 7 Jul 2009 14:32:52 +0000 (+0000) Subject: remove conflict markers X-Git-Tag: 1.31.0-rc.0~41069 X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=23a9f934a97126896f89a94b95d0d7ae0d910141;p=lhc%2Fweb%2Fwiklou.git remove conflict markers --- diff --git a/docs/hooks.txt b/docs/hooks.txt index 974c499a67..e2a745d218 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1534,11 +1534,7 @@ $template: SimpleTemplate instance for the form 'UserLoginMailPassword': Block users from emailing passwords $name: the username to email the password of. -<<<<<<< .mine -&$error: out-param – the error message to return. -======= &$error: out-param - the error message to return. ->>>>>>> .r52831 'UserLogout': before a user logs out $user: the user object that is about to be logged out