fixed merge conflicts.

This commit is contained in:
Taylor Otwell
2011-09-08 17:57:27 -05:00
2 changed files with 9 additions and 1 deletions

View File

@@ -45,4 +45,4 @@ $public = __DIR__;
*/
require $laravel.'/laravel.php';
echo (microtime(true) - START_TIME) * 1000;
echo (microtime(true) - START_TIME) * 1000;