Resolved merge conflict by incorporating changes
Showing
... | @@ -11,31 +11,31 @@ | ... | @@ -11,31 +11,31 @@ |
"license": "MIT", | "license": "MIT", | ||
"type": "project", | "type": "project", | ||
"require": { | "require": { | ||
"php": ">=7.0.0", | "php": ">=7.1.3", | ||
"arcanedev/log-viewer": "^4.4", | "arcanedev/log-viewer": "^4.5", | ||
"arcanedev/no-captcha": "^5.0", | "arcanedev/no-captcha": "^5.0", | ||
"codedungeon/phpunit-result-printer": "0.4.4", | |||
"creativeorange/gravatar": "~1.0", | "creativeorange/gravatar": "~1.0", | ||
"davejamesmiller/laravel-breadcrumbs": "^4.1", | "davejamesmiller/laravel-breadcrumbs": "^5.0", | ||
"doctrine/dbal": "^2.6", | "doctrine/dbal": "^2.6", | ||
"fideloper/proxy": "~3.3", | "fideloper/proxy": "~4.0", | ||
"hieu-le/active": "^3.5", | "hieu-le/active": "^3.5", | ||
"laravel/framework": "5.5.*", | "laravel/framework": "5.6.*", | ||
"laravel/socialite": "^3.0", | "laravel/socialite": "^3.0", | ||
"laravel/tinker": "~1.0", | "laravel/tinker": "~1.0", | ||
"laravelcollective/html": "^5.5.0", | "laravelcollective/html": "^5.4.0", | ||
"tymon/jwt-auth": "dev-develop", | "tymon/jwt-auth": "dev-develop", | ||
"unisharp/laravel-filemanager": "~1.8", | "unisharp/laravel-filemanager": "~1.8", | ||
"yajra/laravel-datatables-oracle": "~8.0" | "yajra/laravel-datatables-oracle": "~8.0" | ||
}, | }, | ||
"require-dev": { | "require-dev": { | ||
"barryvdh/laravel-debugbar": "^3.0", | "barryvdh/laravel-debugbar": "^3.0", | ||
"codedungeon/phpunit-result-printer": "^0.6.0", | |||
"bvipul/generator": "^0.9.1", | "bvipul/generator": "^0.9.1", | ||
"filp/whoops": "~2.0", | "filp/whoops": "~2.0", | ||
"fzaninotto/faker": "~1.4", | "fzaninotto/faker": "~1.4", | ||
"laravel/browser-kit-testing": "^2.0", | "laravel/browser-kit-testing": "^4.0.0", | ||
"mockery/mockery": "0.9.*", | "mockery/mockery": "0.9.*", | ||
"phpunit/phpunit": "~6.0", | "phpunit/phpunit": "~7.0", | ||
"xethron/migrations-generator": "2.0.2" | "xethron/migrations-generator": "2.0.2" | ||
}, | }, | ||
"autoload": { | "autoload": { | ||
... | @@ -69,14 +69,6 @@ | ... | @@ -69,14 +69,6 @@ |
"post-create-project-cmd": [ | "post-create-project-cmd": [ | ||
"php artisan key:generate" | "php artisan key:generate" | ||
], | ], | ||
"post-install-cmd": [ | |||
"Illuminate\\Foundation\\ComposerScripts::postInstall", | |||
"php artisan optimize" | |||
], | |||
"post-update-cmd": [ | |||
"Illuminate\\Foundation\\ComposerScripts::postUpdate", | |||
"php artisan optimize" | |||
], | |||
"post-autoload-dump": [ | "post-autoload-dump": [ | ||
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", | "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", | ||
"@php artisan package:discover" | "@php artisan package:discover" | ||
... | ... |
This diff is collapsed.
config/hashing.php
0 → 100644
config/logging.php
0 → 100644
Please register or sign in to comment