Skip to content

S
syncEnrollments
Commit 5644e8e3 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

fix conflicts.

parents ce5bcb2f c822db1f
Show whitespace changes
Inline Side-by-side
Showing with 2804 additions and 1 deletion
bootstrap/autoload.php
View file @ 5644e8e3
...@@ -27,7 +27,7 @@ require __DIR__.'/../vendor/autoload.php'; ...@@ -27,7 +27,7 @@ require __DIR__.'/../vendor/autoload.php';
| |
*/ */
$compiledPath = __DIR__.'/../storage/framework/compiled.php'; $compiledPath = __DIR__.'/../vendor/compiled.php';
if (file_exists($compiledPath)) { if (file_exists($compiledPath)) {
require $compiledPath; require $compiledPath;
......
composer.lock 0 → 100644
View file @ 5644e8e3
This source diff could not be displayed because it is too large. You can view the blob instead.
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