fix conflicts.

2012-04-18 20:38:36 -05:00
parent 62935964eb 9c823d42be
commit 51f5fdd0c9
6 changed files with 7 additions and 7 deletions
--- a/laravel/laravel.php
+++ b/laravel/laravel.php
@@ -159,4 +159,4 @@ $response->send();
 |
 */

-Event::fire('laravel.done', array($response));
+Event::fire('laravel.done', array($response));