malhuda/laravel
1
0
Fork 0
mirror of https://github.com/laravel/laravel.git synced 2025-02-20 11:53:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix conflicts.

Browse Source
This commit is contained in:
Taylor Otwell 2015-03-13 22:04:40 -05:00
commit 5644e8e320
2 changed files with 2804 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/autoload.php
View File

@ -27,7 +27,7 @@ require __DIR__.'/../vendor/autoload.php';
|
*/
$compiledPath = __DIR__.'/../storage/framework/compiled.php';
$compiledPath = __DIR__.'/../vendor/compiled.php';
if (file_exists($compiledPath)) {
require $compiledPath;

2803
composer.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff