fixed merge conflicts

1 files changed, 1 insertions, 2 deletions

diff --git a/debug_toolbar/panels/cache.py b/debug_toolbar/panels/cache.py
index 263b62b..613d4d9 100644
--- a/debug_toolbar/panels/cache.py
+++ b/debug_toolbar/panels/cache.py
@@ -78,7 +78,7 @@ class CacheDebugPanel(DebugPanel):
     name = 'Cache'
     has_content = True
 
-    def __init__(self, request):
+    def __init__(self):
         # This is hackish but to prevent threading issues is somewhat needed
         if isinstance(cache.cache, CacheStatTracker):
             cache.cache.reset()
@@ -86,7 +86,6 @@ class CacheDebugPanel(DebugPanel):
         else:
             self.cache = CacheStatTracker(cache.cache)
             cache.cache = self.cache
-        super(CacheDebugPanel, self).__init__(request)
 
     def title(self):
         return 'Cache: %.2fms' % self.cache.total_time