diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-10 00:51:26 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-10 00:51:26 -0400 |
| commit | 7e38142d4aa080767617724a98c0cf60c70961d0 (patch) | |
| tree | d4befe70bb5f82fa78b82465ddec597e1d67f72e /actions/login.php | |
| parent | 4b656f47dff2bd6eed4dcfad060b8434d052d883 (diff) | |
Resolve conflicts and convert _t( to _( where it was introduced again.
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
Diffstat (limited to 'actions/login.php')
| -rw-r--r-- | actions/login.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/login.php b/actions/login.php index 649f7ec9a..d84a0b8cb 100644 --- a/actions/login.php +++ b/actions/login.php @@ -66,7 +66,7 @@ class LoginAction extends Action { # success! if (!common_set_user($user)) { - common_server_error(_t('Error setting user.')); + common_server_error(_('Error setting user.')); return; } |