Skip to content

P
Platform
Commit aea8e77e authored by Micheal Mand's avatar Micheal Mand
Browse files
Options

Fix composer conflicts

parent 0938024b
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
Modules/Core/composer.json
View file @ aea8e77e
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"composer/installers": "~1.0", "composer/installers": "~1.0",
"nwidart/laravel-modules": "~3.0", "nwidart/laravel-modules": "^4.0",
"laravelcollective/html": "~5.6.0", "laravelcollective/html": "5.7.*",
"laracasts/presenter": "~0.2", "laracasts/presenter": "~0.2",
"dimsav/laravel-translatable": "~9.0", "dimsav/laravel-translatable": "~9.0",
"mcamara/laravel-localization": "~1.3", "mcamara/laravel-localization": "~1.3",
......
Modules/Menu/composer.json
View file @ aea8e77e
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"composer/installers": "~1.0", "composer/installers": "~1.0",
"nwidart/laravel-menus": "~2.0", "nwidart/laravel-menus": "^3.0",
"typicms/nestablecollection": "1.1.10" "typicms/nestablecollection": "1.1.12"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~7.0", "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

Technounit-GROUP 2023