handle merge conflicts

1 files changed, 4 insertions, 0 deletions

diff --git a/debug_toolbar/panels/signals.py b/debug_toolbar/panels/signals.py
index 7fe382e..56fbfd4 100644
--- a/debug_toolbar/panels/signals.py
+++ b/debug_toolbar/panels/signals.py
@@ -7,6 +7,7 @@ from django.db.models.signals import class_prepared, pre_init, post_init, \
     pre_save, post_save, pre_delete, post_delete, post_syncdb
 from django.dispatch.dispatcher import WEAKREF_TYPES
 from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
 
 try:
     from django.db.backends.signals import connection_created
@@ -34,6 +35,9 @@ class SignalDebugPanel(DebugPanel):
         'post_syncdb': post_syncdb,
     }
 
+    def nav_title(self):
+        return _("Signals")
+
     def title(self):
         return "Signals"