handle merge conflicts

1 files changed, 9 insertions, 0 deletions

diff --git a/debug_toolbar/panels/__init__.py b/debug_toolbar/panels/__init__.py
index 54b3318..cf65aa8 100644
--- a/debug_toolbar/panels/__init__.py
+++ b/debug_toolbar/panels/__init__.py
@@ -14,7 +14,16 @@ class DebugPanel(object):
     def dom_id(self):
         return 'djDebug%sPanel' % (self.name.replace(' ', ''))
 
+    def nav_title(self):
+        """Title showing in toolbar"""
+        raise NotImplementedError
+
+    def nav_subtitle(self):
+        """Subtitle showing until title in toolbar"""
+        return ''
+
     def title(self):
+        """Title showing in panel"""
         raise NotImplementedError
 
     def url(self):