fixed merge conflicts

1 files changed, 6 insertions, 4 deletions

diff --git a/debug_toolbar/panels/timer.py b/debug_toolbar/panels/timer.py
index d520191..ea8ed4a 100644
--- a/debug_toolbar/panels/timer.py
+++ b/debug_toolbar/panels/timer.py
@@ -3,16 +3,18 @@ from debug_toolbar.panels import DebugPanel
 
 class TimerDebugPanel(DebugPanel):
     """
-    Panel that displays the time a response took.
+    Panel that displays the time a response took in milliseconds.
     """
     name = 'Timer'
 
-    def __init__(self, request):
-        super(TimerDebugPanel, self).__init__(request)
+    def process_request(self, request):
         self._start_time = time.time()
 
+    def process_response(self, request, response):
+        self.total_time = (time.time() - self._start_time) * 1000
+
     def title(self):
-        return 'Time: %0.2fms' % ((time.time() - self._start_time) * 1000)
+        return 'Time: %0.2fms' % (self.total_time)
 
     def url(self):
         return ''