fix conflicts

2025-02-20 11:53:14 +08:00 · 2023-11-28 13:35:59 -06:00 · 2023-11-28 13:35:59 -06:00 · 645e13d690
commit 645e13d690
parent de6d4f58cc 73cf5bc5bc
2 changed files with 4 additions and 1 deletions
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@ -11,6 +11,9 @@ use Illuminate\Support\Str;
 */
 class UserFactory extends Factory
 {
+    /**
+     * The current password being used by the factory.
+     */
    protected static ?string $password;

    /**
--- a/package.json
+++ b/package.json
@ -6,7 +6,7 @@
        "build": "vite build"
    },
    "devDependencies": {
-        "axios": "^1.1.2",
+        "axios": "^1.6.1",
        "laravel-vite-plugin": "^0.8.0",
        "vite": "^4.0.0"
    }