Merge branch '3.1'

* 3.1:
  Fix merge
This commit is contained in:
Nicolas Grekas 2016-06-16 10:34:19 +02:00
commit a627bbac05
1 changed files with 0 additions and 1 deletions

View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Yaml\Tests;
use Symfony\Bridge\PhpUnit\ErrorAssert;
use Symfony\Component\Yaml\Yaml;
use Symfony\Component\Yaml\Parser;