fix conflicts.

2012-05-29 17:02:39 -05:00
parent 69d9257a50 4389e5fa46
commit 012663ddbb
3 changed files with 66 additions and 41 deletions
--- a/laravel/auth/drivers/driver.php
+++ b/laravel/auth/drivers/driver.php
@@ -5,6 +5,7 @@ use Laravel\Cookie;
 use Laravel\Config;
 use Laravel\Session;
 use Laravel\Crypter;
+use Laravel\Database\Eloquent\Model as Eloquent;

 abstract class Driver {