fixed test bootstrap

Richard van den Brand · Richard van den Brand · commit 444f3447d8fb · 2012-10-01T09:07:02.000+02:00
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -8,8 +8,4 @@
 * file that was distributed with this source code.
 */
 
-<<<<<<< HEAD
-require 'vendor/autoload.php';
-=======
-require 'vendor/autoload.php';
->>>>>>> 0d86cfc8b6dfa301e173bc2f4c7995b25c055127
+require 'vendor/autoload.php';
