Resolved conflict from last merge.

diff --git a/views.py b/views.py
index b74f4fc..41223aa 100644 (file)
--- a/views.py
+++ b/views.py
@@ -17,13 +17,8 @@ License along with this program; if not, write to the
 Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 """
-<<<<<<< HEAD/views.py
-from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext, Context
-=======
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext, Context, loader
->>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import Group, User
 from django.contrib.auth import authenticate, login