X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Feventmanager.git;a=blobdiff_plain;f=views.py;h=41223aab1246b0d54e0e7c9c9464ce53c3cd4654;hp=b74f4fc5852e74df7e668b6f57d4b2419ea8f5f4;hb=95c63a1a88c14308f58db9504b94fd1844be624f;hpb=d0f8a3ab75f2c71f442beb5fd5cb9852ac75a4d9

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