Commit aea8e77e authored by Micheal Mand's avatar Micheal Mand

Fix composer conflicts

parent 0938024b
......@@ -22,8 +22,8 @@
"require": {
"php": "^7.1.3",
"composer/installers": "~1.0",
"nwidart/laravel-modules": "~3.0",
"laravelcollective/html": "~5.6.0",
"nwidart/laravel-modules": "^4.0",
"laravelcollective/html": "5.7.*",
"laracasts/presenter": "~0.2",
"dimsav/laravel-translatable": "~9.0",
"mcamara/laravel-localization": "~1.3",
......
......@@ -24,8 +24,8 @@
"require": {
"php": "^7.1.3",
"composer/installers": "~1.0",
"nwidart/laravel-menus": "~2.0",
"typicms/nestablecollection": "1.1.10"
"nwidart/laravel-menus": "^3.0",
"typicms/nestablecollection": "1.1.12"
},
"require-dev": {
"phpunit/phpunit": "~7.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment