Merge branch '2.8' into 3.2

* 2.8: typo
2017-06-02 10:29:21 +02:00 · 2017-06-02 10:29:21 +02:00 · 59751226e2
parent a6b525e136 99e0836fd4
commit 59751226e2
1 changed files with 0 additions and 4 deletions
--- a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@ -14,13 +14,9 @@ namespace Symfony\Component\VarDumper\Tests;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
-<<<<<<< HEAD
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
-=======
-use Symfony\Component\VarDumper\Test\VarDumperTestCase;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
->>>>>>> 2.8

 /**
 * @author Nicolas Grekas <p@tchwork.com>