NASER fix conflicts

2026-02-16 10:24:21 +00:00
parent ba8e2950e4 a0a788ce53
commit 1250f18c88
12 changed files with 238 additions and 71 deletions
@@ -12,9 +12,7 @@
        "laravel/framework": "^8.75",
        "laravel/sanctum": "^2.11",
        "laravel/tinker": "^2.5",
-        "tymon/jwt-auth": "^1.0",
-        "morilog/jalali": "^3.4"
-    },
+        "tymon/jwt-auth": "^1.0"},
    "require-dev": {
        "facade/ignition": "^2.5",
        "fakerphp/faker": "^1.9.1",