From 4b656f47dff2bd6eed4dcfad060b8434d052d883 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Wed, 9 Jul 2008 18:46:30 -0400 Subject: Merge conflicts and kill a whole lot of trailing whitespace on lines. darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz --- actions/accesstoken.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actions/accesstoken.php') diff --git a/actions/accesstoken.php b/actions/accesstoken.php index 1c1db8fbc..80c4477d0 100644 --- a/actions/accesstoken.php +++ b/actions/accesstoken.php @@ -27,12 +27,12 @@ class AccesstokenAction extends Action { try { common_debug('getting request from env variables', __FILE__); $req = OAuthRequest::from_request(); - common_debug('getting a server', __FILE__); + common_debug('getting a server', __FILE__); $server = omb_oauth_server(); - common_debug('fetching the access token', __FILE__); + common_debug('fetching the access token', __FILE__); $token = $server->fetch_access_token($req); common_debug('got this token: "'.print_r($token,TRUE).'"', __FILE__); - common_debug('printing the access token', __FILE__); + common_debug('printing the access token', __FILE__); print $token; } catch (OAuthException $e) { common_server_error($e->getMessage()); -- cgit v1.2.3-54-g00ecf