From 7e38142d4aa080767617724a98c0cf60c70961d0 Mon Sep 17 00:00:00 2001
From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Thu, 10 Jul 2008 00:51:26 -0400
Subject: Resolve conflicts and convert _t( to _( where it was introduced
 again.

darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
---
 actions/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions/login.php')

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;
 		}
 
-- 
cgit v1.2.3-54-g00ecf