From 36c21f61811143823e6430ed8faeebc3e221188b Mon Sep 17 00:00:00 2001
From: Sven Joder <sj@pmdevelopment.de>
Date: Wed, 20 Dec 2023 10:44:08 +0100
Subject: [PATCH] fix lockfile

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

diff --git a/composer.lock b/composer.lock
index 0edae5cc..ed77a5e5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9918,21 +9918,12 @@
             "source": {
                 "type": "git",
                 "url": "git@github.com:wirDesign-communication-AG/wirhub.git",
-<<<<<<< HEAD
                 "reference": "ae350fe506c3f1774d03bb3b2e37e310252411ee"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/wirDesign-communication-AG/wirhub/zipball/ae350fe506c3f1774d03bb3b2e37e310252411ee",
                 "reference": "ae350fe506c3f1774d03bb3b2e37e310252411ee",
-=======
-                "reference": "4512a02b9950f9e19a0e8a06bbfd8160a982e3d2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/wirDesign-communication-AG/wirhub/zipball/4512a02b9950f9e19a0e8a06bbfd8160a982e3d2",
-                "reference": "4512a02b9950f9e19a0e8a06bbfd8160a982e3d2",
->>>>>>> 066abfc (Hotfix)
                 "shasum": ""
             },
             "require": {
@@ -10024,11 +10015,7 @@
                 "source": "https://github.com/wirDesign-communication-AG/wirhub/tree/v3.0.18",
                 "issues": "https://github.com/wirDesign-communication-AG/wirhub/issues"
             },
-<<<<<<< HEAD
             "time": "2023-12-20T08:27:33+00:00"
-=======
-            "time": "2023-12-11T14:56:07+00:00"
->>>>>>> 066abfc (Hotfix)
         }
     ],
     "packages-dev": [