resolve merge conflicts

Dropelikeit · Sep 17, 2020 · 7e1bbda · 7e1bbda
1 parent 740da8e
commit 7e1bbda
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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;