From 85c1bb23f4d2f698c27731ae49ff0e1cd2e569a5 Mon Sep 17 00:00:00 2001
From: Marco Rougeth <marco@rougeth.com>
Date: Thu, 15 May 2014 12:47:01 -0300
Subject: [PATCH] Fixing merge conflicts

---
 src/colab/custom_settings.py | 1 +
 1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 9807b88..578a3a8 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -209,6 +209,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.tz',
     'django.contrib.messages.context_processors.messages',
     'django.core.context_processors.request',
+    'django_browserid.context_processors.browserid',
     'django_mobile.context_processors.is_mobile',
     'super_archives.context_processors.mailarchive',
     'home.context_processors.robots',
--
libgit2 0.21.2