1

composer.lock

@@ -4,15 +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",
-=======
-<<<<<<< HEAD
-    "content-hash": "239ee8acadf3c91412a44beeca7f9a96",
-=======
-    "content-hash": "18f0eba83d85f976fd255237eb85f674",
->>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
->>>>>>> collector_1106_fr
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -4377,7 +4369,6 @@
             "time": "2024-09-25T02:54:12+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "jaeger/g-http",
             "version": "V2.0.1",
             "source": {
@@ -4535,11 +4526,6 @@
         {
             "name": "jetbrains/phpstorm-attributes",
             "version": "1.1",
-=======
-<<<<<<< HEAD
-            "name": "jaeger/g-http",
-            "version": "V2.0.1",
->>>>>>> collector_1106_fr
             "source": {
                 "type": "git",
                 "url": "https://github.com/jae-jae/GHttp.git",
@@ -4702,17 +4688,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": ""
@@ -6351,7 +6326,6 @@
             "time": "2023-06-15T09:18:11+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "symfony/cache",
             "version": "v6.4.14",
             "source": {
@@ -6526,11 +6500,6 @@
         {
             "name": "symfony/console",
             "version": "v6.4.14",
-=======
-<<<<<<< HEAD
-            "name": "symfony/cache",
-            "version": "v6.4.16",
->>>>>>> collector_1106_fr
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
@@ -6710,17 +6679,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": ""
@@ -7675,7 +7633,6 @@
                 }
             ],
             "time": "2024-09-25T14:20:29+00:00"
-<<<<<<< HEAD
         },
         {
             "name": "symfony/var-dumper",
@@ -7838,8 +7795,6 @@
                 }
             ],
             "time": "2024-09-25T14:18:03+00:00"
-=======
->>>>>>> 32a7466ce932df46b3fc3cf9b1ac8f32b18dfed2
         },
         {
             "name": "symfony/var-dumper",