diff options
| author | Hardik Ghaghada | 2013-04-26 14:02:28 +0530 |
|---|---|---|
| committer | Hardik Ghaghada | 2013-04-26 14:02:28 +0530 |
| commit | 340e9b28961a4a927e9f039a5cef7111bbf69bf0 (patch) | |
| tree | 056d7b16a104ce7afd375505feab7a879d3f7f99 /testapp/exam/models.py | |
| parent | ca63599e6fecbd513d47092f5aeb03726024bd98 (diff) | |
| parent | 29beb24fe345e7e20919a6122ffb3e0f13371143 (diff) | |
| download | online_test-340e9b28961a4a927e9f039a5cef7111bbf69bf0.tar.gz online_test-340e9b28961a4a927e9f039a5cef7111bbf69bf0.tar.bz2 online_test-340e9b28961a4a927e9f039a5cef7111bbf69bf0.zip | |
Resolved Conflicts
Diffstat (limited to 'testapp/exam/models.py')
| -rw-r--r-- | testapp/exam/models.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/testapp/exam/models.py b/testapp/exam/models.py index 708c7af..00d32e4 100644 --- a/testapp/exam/models.py +++ b/testapp/exam/models.py @@ -1,7 +1,8 @@ import datetime from django.db import models from django.contrib.auth.models import User -from taggit_autocomplete_modified.managers import TaggableManagerAutocomplete as TaggableManager +from taggit_autocomplete_modified.managers import TaggableManagerAutocomplete\ +as TaggableManager from django.http import HttpResponse ################################################################################ class Profile(models.Model): |