FU merge indentation

clue · clue · commit 30a691056a5a · 2015-07-05T16:34:24.000+02:00
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -26,7 +26,7 @@ protected function createPromiseResolved($value = null, $delay = 0.01)
             $deferred->resolve($value);
         });
 
-            return $deferred->promise();
+        return $deferred->promise();
     }
 
     protected function createPromiseRejected($value = null, $delay = 0.01)
@@ -37,7 +37,7 @@ protected function createPromiseRejected($value = null, $delay = 0.01)
             $deferred->reject($value);
         });
 
-            return $deferred->promise();
+        return $deferred->promise();
     }
 
     protected function createTimerInterrupt($delay = 0.01)

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected function createPromiseResolved($value = null, $delay = 0.01)`
`26`	`26`	`$deferred->resolve($value);`
`27`	`27`	`});`
`28`	`28`
`29`		`- return $deferred->promise();`
	`29`	`+ return $deferred->promise();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`protected function createPromiseRejected($value = null, $delay = 0.01)`
`@@ -37,7 +37,7 @@ protected function createPromiseRejected($value = null, $delay = 0.01)`
`37`	`37`	`$deferred->reject($value);`
`38`	`38`	`});`
`39`	`39`
`40`		`- return $deferred->promise();`
	`40`	`+ return $deferred->promise();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`protected function createTimerInterrupt($delay = 0.01)`