Composer

diff --git a/composer.lock b/composer.lock
index a79c370a3d893bb63e8ba31a68adbaa8796057c3..207def65e76ea1f5aa20d0620788b2754b2b0c5e 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "356019e5d0c92aae938f5292dd0fd103",
+    "content-hash": "b3decd4b776853666f122b85e56eedc9",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -4406,13 +4406,10 @@
             "time": "2023-10-05T21:14:48+00:00"
         },
         {
-=======
->>>>>>> e8c256bcff ([Composer] Bump guzzlehttp/guzzle to version 7 to suppress deprecation notices)
             "name": "ua-parser/uap-php",
             "version": "v3.9.14",
             "source": {
                 "type": "git",
->>>>>>> 8c71ed97a4 ([Composer] Bump guzzlehttp/guzzle to version 7 to suppress deprecation notices)
                 "url": "https://github.com/ua-parser/uap-php.git",
                 "reference": "b796c5ea5df588e65aeb4e2c6cce3811dec4fed6"
             },