Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolving merge conflicts.

This commit is contained in:
Taylor Otwell 2012-02-22 09:00:43 -06:00
parent 0f448271f6 b5f568404a
commit 257d917e19
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.php
View File

@ -31,4 +31,4 @@
// -------------------------------------------------------------- // --------------------------------------------------------------
// Launch Laravel. // Launch Laravel.
// -------------------------------------------------------------- // --------------------------------------------------------------
require path('sys').'laravel.php'; require path('sys').'laravel.php';