fix conflicts

2021-10-02 10:47:56 -05:00
parent 2c644455da 78e1d56c42
commit bdcb9681a6
6 changed files with 12 additions and 12 deletions
--- a/composer.json
+++ b/composer.json
@@ -15,9 +15,9 @@
    "require-dev": {
        "fakerphp/faker": "^1.9.1",
        "laravel/sail": "^1.0.1",
-        "mockery/mockery": "^1.4.2",
+        "mockery/mockery": "^1.4.4",
        "nunomaduro/collision": "^6.0",
-        "phpunit/phpunit": "^9.3.3"
+        "phpunit/phpunit": "^9.5.8"
    },
    "autoload": {
        "psr-4": {