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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/actions/finishimmediate.php b/actions/finishimmediate.php
index 99c868f46..6dbaa3d1c 100644
--- a/actions/finishimmediate.php
+++ b/actions/finishimmediate.php
@@ -25,7 +25,7 @@ class FinishimmediateAction extends Action {
 
 	function handle($args) {
 		parent::handle($args);
-		
+
 		$consumer = oid_consumer();
 
 		$response = $consumer->complete(common_local_url('finishimmediate'));
@@ -36,7 +36,7 @@ class FinishimmediateAction extends Action {
 			  $response->endpoint->canonicalID : $response->getDisplayIdentifier();
 
 			$user = oid_get_user($canonical);
-			
+
 			if ($user) {
 				oid_update_user($user, $sreg);
 				oid_set_last($display); # refresh for another year
@@ -47,12 +47,12 @@ class FinishimmediateAction extends Action {
 		}
 
 		# Failure! Clear openid so we don't try it again
-		
+
 		oid_clear_last();
 		$this->go_backto();
 		return;
 	}
-	
+
 	function go_backto() {
 		common_ensure_session();
 		$backto = $_SESSION['openid_immediate_backto'];