resolve conflict

This commit is contained in:
Thanh Quy - wolf
2026-03-29 22:29:44 +07:00
30 changed files with 4926 additions and 880 deletions
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "temp",
"version": "0.1.0",
"version": "1.0.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "temp",
"version": "0.1.0",
"version": "1.0.3",
"dependencies": {
"next": "16.1.7",
"php": "^1.1.0",