Skip to content

Commit

Permalink
Fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
dereuromark authored Dec 27, 2019
1 parent 219978f commit 707c49e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@
"phpstan": "phpstan analyse src/",
"phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json",
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover=clover.xml",
"phpstan": "phpstan analyse src/",
"phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json"
"test-coverage": "phpunit --coverage-clover=clover.xml"
},
"prefer-stable": true,
"minimum-stability": "dev"
Expand Down

0 comments on commit 707c49e

Please sign in to comment.