solving conflict
Ilham Wara Nugroho
parent
6a3517ddf0
commit
f93556c30b
|
|
@ -3709,18 +3709,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
<<<<<<< HEAD
|
||||
"version": "v6.4.36",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "9f481cfb580db8bcecc9b2d4c63f3e13df022ad5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/9f481cfb580db8bcecc9b2d4c63f3e13df022ad5",
|
||||
"reference": "9f481cfb580db8bcecc9b2d4c63f3e13df022ad5",
|
||||
=======
|
||||
"version": "v6.4.37",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -3731,7 +3719,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/7bbcaf3fdb1e18fa42a7f0b84a10d091c10548f5",
|
||||
"reference": "7bbcaf3fdb1e18fa42a7f0b84a10d091c10548f5",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3796,11 +3783,7 @@
|
|||
"terminal"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/console/tree/v6.4.36"
|
||||
=======
|
||||
"source": "https://github.com/symfony/console/tree/v6.4.37"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -3820,22 +3803,6 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2026-03-27T15:30:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v7.4.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/css-selector.git",
|
||||
"reference": "b055f228a4178a1d6774909903905e3475f3eac8"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/b055f228a4178a1d6774909903905e3475f3eac8",
|
||||
"reference": "b055f228a4178a1d6774909903905e3475f3eac8",
|
||||
=======
|
||||
"time": "2026-04-13T15:27:04+00:00"
|
||||
},
|
||||
{
|
||||
|
|
@ -3850,7 +3817,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/css-selector/zipball/b75663ed96cf4756e28e3105476f220f92886cc4",
|
||||
"reference": "b75663ed96cf4756e28e3105476f220f92886cc4",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -3886,11 +3852,7 @@
|
|||
"description": "Converts CSS selectors to XPath expressions",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/css-selector/tree/v7.4.8"
|
||||
=======
|
||||
"source": "https://github.com/symfony/css-selector/tree/v7.4.9"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -3910,11 +3872,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2026-03-24T13:12:05+00:00"
|
||||
=======
|
||||
"time": "2026-04-18T13:18:21+00:00"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
{
|
||||
"name": "symfony/deprecation-contracts",
|
||||
|
|
@ -4140,18 +4098,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
<<<<<<< HEAD
|
||||
"version": "v7.4.8",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
"reference": "f57b899fa736fd71121168ef268f23c206083f0a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f57b899fa736fd71121168ef268f23c206083f0a",
|
||||
"reference": "f57b899fa736fd71121168ef268f23c206083f0a",
|
||||
=======
|
||||
"version": "v7.4.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -4162,7 +4108,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e4a2e29753c7801f7a8340e066cfa788f3bc8101",
|
||||
"reference": "e4a2e29753c7801f7a8340e066cfa788f3bc8101",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4214,11 +4159,7 @@
|
|||
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/event-dispatcher/tree/v7.4.8"
|
||||
=======
|
||||
"source": "https://github.com/symfony/event-dispatcher/tree/v7.4.9"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -4238,11 +4179,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2026-03-30T13:54:39+00:00"
|
||||
=======
|
||||
"time": "2026-04-18T13:18:21+00:00"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher-contracts",
|
||||
|
|
@ -4545,18 +4482,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
<<<<<<< HEAD
|
||||
"version": "v6.4.36",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-kernel.git",
|
||||
"reference": "4087ec02119de450e9ebb60806d69c6bb8c6e468"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/4087ec02119de450e9ebb60806d69c6bb8c6e468",
|
||||
"reference": "4087ec02119de450e9ebb60806d69c6bb8c6e468",
|
||||
=======
|
||||
"version": "v6.4.38",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -4567,7 +4492,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/769c1ee766d6c327176f4e3bdaad58f521193abd",
|
||||
"reference": "769c1ee766d6c327176f4e3bdaad58f521193abd",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4652,11 +4576,7 @@
|
|||
"description": "Provides a structured process for converting a Request into a Response",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/http-kernel/tree/v6.4.36"
|
||||
=======
|
||||
"source": "https://github.com/symfony/http-kernel/tree/v6.4.38"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -4676,11 +4596,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2026-03-31T20:38:11+00:00"
|
||||
=======
|
||||
"time": "2026-05-06T13:04:40+00:00"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
{
|
||||
"name": "symfony/mailer",
|
||||
|
|
@ -4768,18 +4684,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/mime",
|
||||
<<<<<<< HEAD
|
||||
"version": "v6.4.36",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/mime.git",
|
||||
"reference": "9c31726137c70798f815fb98293ffb8a2a47694c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/mime/zipball/9c31726137c70798f815fb98293ffb8a2a47694c",
|
||||
"reference": "9c31726137c70798f815fb98293ffb8a2a47694c",
|
||||
=======
|
||||
"version": "v6.4.37",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -4790,7 +4694,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/mime/zipball/330077bc7fbe314758aff62834b758d06ac6d260",
|
||||
"reference": "330077bc7fbe314758aff62834b758d06ac6d260",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -4846,11 +4749,7 @@
|
|||
"mime-type"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/mime/tree/v6.4.36"
|
||||
=======
|
||||
"source": "https://github.com/symfony/mime/tree/v6.4.37"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -4870,19 +4769,11 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2026-03-30T09:31:23+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
"version": "v1.33.0",
|
||||
=======
|
||||
"time": "2026-04-29T09:53:28+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
"version": "v1.37.0",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-ctype.git",
|
||||
|
|
@ -4941,11 +4832,7 @@
|
|||
"portable"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -4969,18 +4856,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-grapheme",
|
||||
<<<<<<< HEAD
|
||||
"version": "v1.33.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
|
||||
"reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
|
||||
"reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
|
||||
=======
|
||||
"version": "v1.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -4991,7 +4866,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e",
|
||||
"reference": "4864388bfbd3001ce88e234fab652acd91fdc57e",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -5040,11 +4914,7 @@
|
|||
"shim"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5064,19 +4934,11 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2025-06-27T09:58:17+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-idn",
|
||||
"version": "v1.33.0",
|
||||
=======
|
||||
"time": "2026-04-26T13:13:48+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-idn",
|
||||
"version": "v1.37.0",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-intl-idn.git",
|
||||
|
|
@ -5139,11 +5001,7 @@
|
|||
"shim"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5167,11 +5025,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/polyfill-intl-normalizer",
|
||||
<<<<<<< HEAD
|
||||
"version": "v1.33.0",
|
||||
=======
|
||||
"version": "v1.37.0",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
|
||||
|
|
@ -5232,11 +5086,7 @@
|
|||
"shim"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5260,11 +5110,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/polyfill-mbstring",
|
||||
<<<<<<< HEAD
|
||||
"version": "v1.33.0",
|
||||
=======
|
||||
"version": "v1.37.0",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||
|
|
@ -5325,11 +5171,7 @@
|
|||
"shim"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5353,11 +5195,7 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php80",
|
||||
<<<<<<< HEAD
|
||||
"version": "v1.33.0",
|
||||
=======
|
||||
"version": "v1.37.0",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php80.git",
|
||||
|
|
@ -5417,11 +5255,7 @@
|
|||
"shim"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5445,18 +5279,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php83",
|
||||
<<<<<<< HEAD
|
||||
"version": "v1.33.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php83.git",
|
||||
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
|
||||
"reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
|
||||
=======
|
||||
"version": "v1.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -5467,7 +5289,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/3600c2cb22399e25bb226e4a135ce91eeb2a6149",
|
||||
"reference": "3600c2cb22399e25bb226e4a135ce91eeb2a6149",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -5514,11 +5335,7 @@
|
|||
"shim"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-php83/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5538,19 +5355,11 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2025-07-08T02:45:35+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-uuid",
|
||||
"version": "v1.33.0",
|
||||
=======
|
||||
"time": "2026-04-10T17:25:58+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-uuid",
|
||||
"version": "v1.37.0",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-uuid.git",
|
||||
|
|
@ -5609,11 +5418,7 @@
|
|||
"uuid"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0"
|
||||
=======
|
||||
"source": "https://github.com/symfony/polyfill-uuid/tree/v1.37.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5702,18 +5507,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
<<<<<<< HEAD
|
||||
"version": "v6.4.34",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/routing.git",
|
||||
"reference": "5ab3a3e1a03535ec5ca6ce2d39e4369a1096ae47"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/5ab3a3e1a03535ec5ca6ce2d39e4369a1096ae47",
|
||||
"reference": "5ab3a3e1a03535ec5ca6ce2d39e4369a1096ae47",
|
||||
=======
|
||||
"version": "v6.4.37",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -5724,7 +5517,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/48035d186798d27d375d95aad37db8fe097e4048",
|
||||
"reference": "48035d186798d27d375d95aad37db8fe097e4048",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -5778,11 +5570,7 @@
|
|||
"url"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/routing/tree/v6.4.34"
|
||||
=======
|
||||
"source": "https://github.com/symfony/routing/tree/v6.4.37"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5802,22 +5590,6 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2026-02-24T17:34:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/service-contracts",
|
||||
"version": "v3.6.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/service-contracts.git",
|
||||
"reference": "45112560a3ba2d715666a509a0bc9521d10b6c43"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43",
|
||||
"reference": "45112560a3ba2d715666a509a0bc9521d10b6c43",
|
||||
=======
|
||||
"time": "2026-04-18T13:45:55+00:00"
|
||||
},
|
||||
{
|
||||
|
|
@ -5832,7 +5604,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a",
|
||||
"reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -5886,11 +5657,7 @@
|
|||
"standards"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/service-contracts/tree/v3.6.1"
|
||||
=======
|
||||
"source": "https://github.com/symfony/service-contracts/tree/v3.7.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -5910,11 +5677,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2025-07-15T11:30:57+00:00"
|
||||
=======
|
||||
"time": "2026-03-28T09:44:51+00:00"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
{
|
||||
"name": "symfony/string",
|
||||
|
|
@ -6009,18 +5772,6 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
<<<<<<< HEAD
|
||||
"version": "v6.4.34",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "d07d117db41341511671b0a1a2be48f2772189ce"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/d07d117db41341511671b0a1a2be48f2772189ce",
|
||||
"reference": "d07d117db41341511671b0a1a2be48f2772189ce",
|
||||
=======
|
||||
"version": "v6.4.38",
|
||||
"source": {
|
||||
"type": "git",
|
||||
|
|
@ -6031,7 +5782,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/afaa31b0c12d9a659eed1ea97f268a614cc1299c",
|
||||
"reference": "afaa31b0c12d9a659eed1ea97f268a614cc1299c",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -6097,11 +5847,7 @@
|
|||
"description": "Provides tools to internationalize your application",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/translation/tree/v6.4.34"
|
||||
=======
|
||||
"source": "https://github.com/symfony/translation/tree/v6.4.38"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -6121,22 +5867,6 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2026-02-16T20:44:03+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation-contracts",
|
||||
"version": "v3.6.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation-contracts.git",
|
||||
"reference": "65a8bc82080447fae78373aa10f8d13b38338977"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977",
|
||||
"reference": "65a8bc82080447fae78373aa10f8d13b38338977",
|
||||
=======
|
||||
"time": "2026-05-06T08:55:54+00:00"
|
||||
},
|
||||
{
|
||||
|
|
@ -6151,7 +5881,6 @@
|
|||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation-contracts/zipball/0ab302977a952b42fd51475c4ebac81f8da0a95d",
|
||||
"reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d",
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -6200,11 +5929,7 @@
|
|||
"standards"
|
||||
],
|
||||
"support": {
|
||||
<<<<<<< HEAD
|
||||
"source": "https://github.com/symfony/translation-contracts/tree/v3.6.1"
|
||||
=======
|
||||
"source": "https://github.com/symfony/translation-contracts/tree/v3.7.0"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
|
|
@ -6224,11 +5949,7 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2025-07-15T13:41:35+00:00"
|
||||
=======
|
||||
"time": "2026-01-05T13:30:16+00:00"
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
},
|
||||
{
|
||||
"name": "symfony/uid",
|
||||
|
|
@ -6607,12 +6328,6 @@
|
|||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
<<<<<<< HEAD
|
||||
"time": "2024-11-21T01:49:47+00:00"
|
||||
}
|
||||
],
|
||||
"packages-dev": [
|
||||
=======
|
||||
"time": "2026-04-26T05:33:54+00:00"
|
||||
}
|
||||
],
|
||||
|
|
@ -7158,7 +6873,6 @@
|
|||
},
|
||||
"time": "2025-10-17T16:34:55+00:00"
|
||||
},
|
||||
>>>>>>> 5cab2eb4fb2aa56f22867db0c29ad2b66de3663c
|
||||
{
|
||||
"name": "fakerphp/faker",
|
||||
"version": "v1.24.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue