Fix composer.lock unmerged

2022-06-17 14:24:34 +02:00 · 2022-06-17 14:24:34 +02:00 · 16dcb72800
commit 16dcb72800
parent 8c94f580a9
1 changed files with 0 additions and 4 deletions
--- 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",