ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts.

Browse Source
This commit is contained in:
Taylor Otwell
2012-04-18 20:38:36 -05:00
parent 62935964eb 9c823d42be
commit 51f5fdd0c9
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/core.php
View File

@@ -219,7 +219,7 @@ if (defined('STDIN'))
|
| Finally we will register all of the bundles that have been defined for
| the application. None of them will be started, yet but will be setup
| so that they may be started by the develop at any time.
| so that they may be started by the developer at any time.
|
*/