fix merge

This commit is contained in:
Christian Flothmann 2020-09-18 16:07:46 +02:00
parent d1353c0602
commit 50f37f0ccc
2 changed files with 2 additions and 2 deletions

View File

@ -12,7 +12,7 @@
namespace Symfony\Component\EventDispatcher\Tests\Debug;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Debug\BufferingLogger;
use Symfony\Component\ErrorHandler\BufferingLogger;
use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcher;

View File

@ -23,7 +23,7 @@
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/expression-language": "^3.4|^4.0|^5.0",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/debug": "~3.4|~4.4",
"symfony/error-handler": "~3.4|~4.4",
"symfony/http-foundation": "^3.4|^4.0|^5.0",
"symfony/service-contracts": "^1.1|^2",
"symfony/stopwatch": "^3.4|^4.0|^5.0",