fix conflicts

This commit is contained in:
Taylor Otwell
2023-02-08 11:12:47 -06:00

View File

@@ -29,7 +29,7 @@ REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_MAILER=smtp
MAIL_HOST=mailhog
MAIL_HOST=mailpit
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null