Merge conflicts and kill a whole lot of trailing whitespace on lines.

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz

1 files changed, 3 insertions, 3 deletions

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());