Commit 5644e8e3 by Taylor Otwell

fix conflicts.

parents ce5bcb2f c822db1f
......@@ -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;
......
This diff is collapsed. Click to expand it.
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