From 95c63a1a88c14308f58db9504b94fd1844be624f Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Fri, 28 Sep 2007 08:50:30 -0300 Subject: [PATCH] Resolved conflict from last merge. --- views.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/views.py b/views.py index b74f4fc..41223aa 100644 --- 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 -- 2.20.1