Fix merge errors

ConductionNL · Jan 8, 2020 · a22b7bb · a22b7bb
1 parent 4f557d8
commit a22b7bb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/api/src/Entity/Order.php b/api/src/Entity/Order.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Serializer\Annotation\MaxDepth;
 
 /**
  * An entity representing an order.

diff --git a/api/src/Entity/OrderItem.php b/api/src/Entity/OrderItem.php
@@ -11,7 +11,6 @@
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Serializer\Annotation\MaxDepth;
 
 /**
  * An entity representing an item of an order.