diff options
| author | Alex Gaynor | 2009-03-21 12:17:05 -0400 |
|---|---|---|
| committer | Alex Gaynor | 2009-03-21 12:17:05 -0400 |
| commit | 4ffe14db039981d06aa58f3ad3c2b3472824961b (patch) | |
| tree | b6a94348f2c20bfb6c29303227889d70f06c62c3 /debug_toolbar/toolbar/loader.py | |
| parent | 0fea345f0d59ed0f17f29e59072f34d7d016abde (diff) | |
| parent | 8c64bb0cc82c6129b4ab14ff4cc80880761680d4 (diff) | |
| download | django-debug-toolbar-4ffe14db039981d06aa58f3ad3c2b3472824961b.tar.bz2 | |
resoled merge conflicts
Diffstat (limited to 'debug_toolbar/toolbar/loader.py')
| -rw-r--r-- | debug_toolbar/toolbar/loader.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index b217665..2422f3d 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -18,8 +18,8 @@ class DebugToolbar(object): 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', 'debug_toolbar.panels.headers.HeaderDebugPanel', 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', - 'debug_toolbar.panels.template.TemplateDebugPanel', 'debug_toolbar.panels.sql.SQLDebugPanel', + 'debug_toolbar.panels.template.TemplateDebugPanel', 'debug_toolbar.panels.cache.CacheDebugPanel', 'debug_toolbar.panels.logger.LoggingPanel', ) |