ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Taylor Otwell
2023-11-28 13:35:59 -06:00
parent de6d4f58cc 73cf5bc5bc
commit 645e13d690
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
database/factories/UserFactory.php
View File

@@ -11,6 +11,9 @@ use Illuminate\Support\Str;
*/ */
class UserFactory extends Factory class UserFactory extends Factory
{ {
/**
* The current password being used by the factory.
*/
protected static ?string $password; protected static ?string $password;
/** /**

2
package.json
View File

@@ -6,7 +6,7 @@
"build": "vite build" "build": "vite build"
}, },
"devDependencies": { "devDependencies": {
"axios": "^1.1.2", "axios": "^1.6.1",
"laravel-vite-plugin": "^0.8.0", "laravel-vite-plugin": "^0.8.0",
"vite": "^4.0.0" "vite": "^4.0.0"
} }