Merge branch 'develop' of github.com:laravel/laravel into develop

2019-12-20 14:48:16 -06:00 · 2019-12-20 14:48:16 -06:00 · f4c8190744
parent cf5e99e9aa e6471a6f2e
commit f4c8190744
1 changed files with 1 additions and 1 deletions
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@ -15,7 +15,7 @@
 |
 */

-/** @var \Illuminate\Database\Eloquent\Factory $factory */
+/* @var \Illuminate\Database\Eloquent\Factory $factory */

 $factory->define(User::class, function (Faker $faker) {
    return [