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

[quix0rs-gnu-social.git] / actions / accesstoken.php

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index 1c1db8fbc4f0aab97dfe72aaa2ef6550d1c95a90..80c4477d030e14f991480189c144525e9edb5ddc 100644 (file)
--- 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());