fix conflicts

ahaneef29 · Nov 28, 2023 · 645e13d · 645e13d
2 parents de6d4f5 + 73cf5bc
commit 645e13d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -11,6 +11,9 @@
  */
 class UserFactory extends Factory
 {
+    /**
+     * The current password being used by the factory.
+     */
     protected static ?string $password;
 
     /**

diff --git 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"
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,9 @@ @@
      */
     class UserFactory extends Factory
     {
+        /**
+         * The current password being used by the factory.
+         */
         protected static ?string $password;
         /**
@@ Expand Down @@