handle merge conflicts

1 files changed, 6 insertions, 1 deletions

diff --git a/debug_toolbar/panels/settings_vars.py b/debug_toolbar/panels/settings_vars.py
index e090718..f30f601 100644
--- a/debug_toolbar/panels/settings_vars.py
+++ b/debug_toolbar/panels/settings_vars.py
@@ -1,8 +1,10 @@
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.views.debug import get_safe_settings
+from django.utils.translation import ugettext_lazy as _
 from debug_toolbar.panels import DebugPanel
 
+
 class SettingsVarsDebugPanel(DebugPanel):
     """
     A panel to display all variables in django.conf.settings
@@ -10,8 +12,11 @@ class SettingsVarsDebugPanel(DebugPanel):
     name = 'SettingsVars'
     has_content = True
 
+    def nav_title(self):
+        return _('Settings')
+
     def title(self):
-        return 'Settings'
+        return 'Settings from <code>%s</code>' % settings.SETTINGS_MODULE
 
     def url(self):
         return ''