Eek, uncommitted merge fix. Bad vim...

make_mozilla/events/views.py

@@ -6,11 +6,7 @@
 from django.contrib.gis.feeds import GeoRSSFeed
 from django.utils.http import urlquote_plus, urlencode
 from django.views.decorators.csrf import csrf_protect
-<<<<<<< HEAD
-from django.shortcuts import redirect
-=======
-from django.shortcuts import get_object_or_404
->>>>>>> 404 on bad URLs at /events/:id
+from django.shortcuts import redirect, get_object_or_404
 
 import urllib2
 import json