Skip to content

U
UserAdminV2
Commit f580ef7f by Taylor Otwell
Options

fixed merge conflict.

parents a9f6fbd7 4072b54f
Showing with 1 additions and 2 deletions
public/index.php
...@@ -55,4 +55,4 @@ $public = __DIR__; ...@@ -55,4 +55,4 @@ $public = __DIR__;
| 3... 2... 1... Lift-off! | 3... 2... 1... Lift-off!
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
*/ */
require $laravel.'/laravel.php'; require $laravel.'/laravel.php';
\ No newline at end of file
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