updated composer and merge conflicts

This commit is contained in:
ArnabChatterjee20k 2025-08-27 17:02:52 +05:30
parent ba0d334f80
commit 8338a7318f

6
composer.lock generated
View file

@ -4927,19 +4927,15 @@
{
"name": "appwrite/sdk-generator",
"version": "1.1.15",
"version": "1.1.15",
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator.git",
"reference": "8e8e39634ba7558704522959d88f3542563a5444"
"reference": "8e8e39634ba7558704522959d88f3542563a5444"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/8e8e39634ba7558704522959d88f3542563a5444",
"reference": "8e8e39634ba7558704522959d88f3542563a5444",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/8e8e39634ba7558704522959d88f3542563a5444",
"reference": "8e8e39634ba7558704522959d88f3542563a5444",
"shasum": ""
},
"require": {
@ -4976,10 +4972,8 @@
"support": {
"issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/1.1.15"
"source": "https://github.com/appwrite/sdk-generator/tree/1.1.15"
},
"time": "2025-08-27T04:59:35+00:00"
"time": "2025-08-27T04:59:35+00:00"
},
{
"name": "doctrine/annotations",