Skip to content

Commit f78a7bc

Browse files
committed
Merge branch 'master' into 2.1-merge
# Conflicts: # src/validation/composer.json
2 parents ae5c6e9 + 5384399 commit f78a7bc

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
"require": {
2121
"php": ">=7.2",
2222
"egulias/email-validator": "^2.1",
23-
"hyperf/command": "~2.1.0",
2423
"hyperf/contract": "~2.1.0",
2524
"hyperf/database": "~2.1.0",
26-
"hyperf/devtool": "~2.1.0",
2725
"hyperf/di": "~2.1.0",
2826
"hyperf/framework": "~2.1.0",
2927
"hyperf/http-server": "~2.1.0",
@@ -37,6 +35,7 @@
3735
"require-dev": {
3836
"friendsofphp/php-cs-fixer": "^2.14",
3937
"hyperf/db-connection": "~2.1.0",
38+
"hyperf/devtool": "~2.1.0",
4039
"hyperf/testing": "~2.1.0",
4140
"mockery/mockery": "^1.2"
4241
},

0 commit comments

Comments
 (0)