From 16dcb728006b0abeb9cb49ba1b27e2264d189ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Fri, 17 Jun 2022 14:24:34 +0200
Subject: [PATCH] Fix composer.lock unmerged

---
 composer.lock | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 6ad74d1..a57cf3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1567,11 +1567,7 @@
                 "issues": "https://github.com/Kwaadpepper/crud-policies/issues",
                 "source": "https://github.com/Kwaadpepper/crud-policies/tree/0.4.5"
             },
-<<<<<<< HEAD
-            "time": "2022-06-15T15:19:14+00:00"
-=======
             "time": "2022-06-15T15:42:22+00:00"
->>>>>>> origin/ticket928
         },
         {
             "name": "kwaadpepper/enum",