Merge branch 'refs/heads/parent-test-fix'

cboden · cboden · commit 1b709f0cbd67 · 2014-05-25T12:56:53.000-04:00
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,6 +2,6 @@
 
 $loader = @include __DIR__ . '/../vendor/autoload.php';
 if (!$loader) {
-    $loader = require __DIR__ . '/../../../vendor/autoload.php';
+    $loader = require __DIR__ . '/../../../../vendor/autoload.php';
 }
 $loader->addPsr4('React\\Tests\\Dns\\', __DIR__);

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`$loader = @include __DIR__ . '/../vendor/autoload.php';`
`4`	`4`	`if (!$loader) {`
`5`		`- $loader = require __DIR__ . '/../../../vendor/autoload.php';`
	`5`	`+ $loader = require __DIR__ . '/../../../../vendor/autoload.php';`
`6`	`6`	`}`
`7`	`7`	`$loader->addPsr4('React\\Tests\\Dns\\', __DIR__);`