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/settings.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/settings.py')
| -rw-r--r-- | testapp/settings.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/testapp/settings.py b/testapp/settings.py index 10d0919..0002476 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -148,11 +148,9 @@ INSTALLED_APPS = ( 'taggit', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', -# 'south', 'exam', 'taggit_autocomplete_modified', - 'debug_toolbar', - #'django_extensions', + 'debug_toolbar', ) # A sample logging configuration. The only tangible logging |