fixed merge conflicts

1 files changed, 15 insertions, 5 deletions

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index 29cec02..54b3318 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -6,9 +6,10 @@ class DebugPanel(object):
     """
     # name = Base
     has_content = False # If content returns something, set to true in subclass
-    
-    def __init__(self, request):
-        self.request = request
+
+    # Panel methods
+    def __init__(self):
+        pass
 
     def dom_id(self):
         return 'djDebug%sPanel' % (self.name.replace(' ', ''))
@@ -20,6 +21,15 @@ class DebugPanel(object):
         raise NotImplementedError
 
     def content(self):
-        # TODO: This is a bit flaky in that panel.content() returns a string 
-        # that gets inserted into the toolbar HTML template.
         raise NotImplementedError
+
+    # Standard middleware methods
+    def process_request(self, request):
+        pass
+
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        pass
+
+    def process_response(self, request, response):
+        pass
+