1

composer.lock

@@ -4,11 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-<<<<<<< HEAD
-    "content-hash": "239ee8acadf3c91412a44beeca7f9a96",
-=======
-    "content-hash": "18f0eba83d85f976fd255237eb85f674",
->>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
+    "content-hash": "cccded5c20a475a6d67e9cd987ccd087",
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -4373,7 +4369,6 @@
             "time": "2024-09-25T02:54:12+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "jaeger/g-http",
             "version": "V2.0.1",
             "source": {
@@ -4538,17 +4533,6 @@
             },
             "dist": {
                 "type": "zip",
-=======
-            "name": "jetbrains/phpstorm-attributes",
-            "version": "1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/JetBrains/phpstorm-attributes.git",
-                "reference": "64de815a4509c29e00d5e3474087fd24c171afc2"
-            },
-            "dist": {
-                "type": "zip",
->>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
                 "url": "https://api.github.com/repos/JetBrains/phpstorm-attributes/zipball/64de815a4509c29e00d5e3474087fd24c171afc2",
                 "reference": "64de815a4509c29e00d5e3474087fd24c171afc2",
                 "shasum": ""
@@ -4779,16 +4763,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.8.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67"
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67",
-                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
                 "shasum": ""
             },
             "require": {
@@ -4866,7 +4850,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.8.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.8.1"
             },
             "funding": [
                 {
@@ -4878,7 +4862,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-12T13:57:08+00:00"
+            "time": "2024-12-05T17:15:07+00:00"
         },
         {
             "name": "nesbot/carbon",
@@ -6187,7 +6171,6 @@
             "time": "2023-06-15T09:18:11+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "symfony/cache",
             "version": "v6.4.16",
             "source": {
@@ -6369,17 +6352,6 @@
             },
             "dist": {
                 "type": "zip",
-=======
-            "name": "symfony/console",
-            "version": "v6.4.15",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd"
-            },
-            "dist": {
-                "type": "zip",
->>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
                 "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
                 "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd",
                 "shasum": ""
@@ -7334,7 +7306,6 @@
                 }
             ],
             "time": "2024-09-25T14:20:29+00:00"
-<<<<<<< HEAD
         },
         {
             "name": "symfony/var-dumper",
@@ -7497,8 +7468,6 @@
                 }
             ],
             "time": "2024-09-25T14:18:03+00:00"
-=======
->>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
         },
         {
             "name": "vlucas/phpdotenv",