From 7e1bbdadee2766fb7db5ef31b559b99d91658611 Mon Sep 17 00:00:00 2001 From: Marcel Strahl Date: Thu, 17 Sep 2020 10:26:23 +0200 Subject: [PATCH] resolve merge conflicts --- tests/ResponseFactoryTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ResponseFactoryTest.php b/tests/ResponseFactoryTest.php index d9f60a9..770c768 100644 --- a/tests/ResponseFactoryTest.php +++ b/tests/ResponseFactoryTest.php @@ -4,6 +4,7 @@ namespace Dropelikeit\LaravelJmsSerializer\Tests; use Doctrine\Common\Annotations\AnnotationRegistry; +use Dropelikeit\LaravelJmsSerializer\Config\Config; use Dropelikeit\LaravelJmsSerializer\Config\ConfigInterface; use Dropelikeit\LaravelJmsSerializer\Exception\SerializeType; use Dropelikeit\LaravelJmsSerializer\ResponseFactory;