handle merge conflicts

1 files changed, 4 insertions, 0 deletions

diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index e99b9c5..f090c78 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -7,6 +7,7 @@ from django.dispatch import Signal
 from django.template.context import get_standard_processors
 from django.template.loader import render_to_string
 from django.test.signals import template_rendered
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
 # Code taken and adapted from Simon Willison and Django Snippets:
@@ -41,6 +42,9 @@ class TemplateDebugPanel(DebugPanel):
     def _store_template_info(self, sender, **kwargs):
         self.templates.append(kwargs)
 
+    def nav_title(self):
+        return _('Templates')
+
     def title(self):
         num_templates = len([t for t in self.templates
             if not t['template'].name.startswith('debug_toolbar/')])