diff options
| author | Jayaram Pai | 2014-04-19 18:12:57 +0530 |
|---|---|---|
| committer | Jayaram Pai | 2014-04-19 18:12:57 +0530 |
| commit | 1f0b55a3e1500660945f0702aa00c90a23ca4d95 (patch) | |
| tree | 5ae3d6615149261115dbf3ebc5155db5267d8fe7 /drupal_auth | |
| parent | bf734e04b25ca97c897f431af8ac9966279337f5 (diff) | |
| parent | 2fbf3ecf6cae63691380ec8cc9df2c4beff29dae (diff) | |
| download | FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.tar.gz FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.tar.bz2 FOSSEE-Forum-1f0b55a3e1500660945f0702aa00c90a23ca4d95.zip | |
fixed merge conflict
Diffstat (limited to 'drupal_auth')
| -rw-r--r-- | drupal_auth/models.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drupal_auth/models.py b/drupal_auth/models.py index 3ad6ffb..9e7fe5f 100644 --- a/drupal_auth/models.py +++ b/drupal_auth/models.py @@ -10,6 +10,7 @@ class Users(models.Model): id = models.IntegerField(primary_key=True, db_column='uid') username = models.CharField(max_length=60L, unique=True, db_column='name') password = models.CharField(max_length=32L, db_column='pass') # Field renamed because it was a Python reserved word. + email = models.CharField(max_length=200L, db_column='mail') last_login = models.DateTimeField(auto_now_add=True) USERNAME_FIELD = 'username' |