From: Magnus Hagander <magnus@hagander.net>
Date: Sun, 2 Sep 2018 17:34:26 +0000 (+0200)
Subject: Even more event merge failures
X-Git-Tag: FINAL_PY2~169
X-Git-Url: http://git.postgresql.org/gitweb/static/%7B%7Bpgdulink%28?a=commitdiff_plain;h=f74cfd1a682d09488b44f5dc029b283a45f34dd1;p=pgeu-web.git

Even more event merge failures
---

diff --git a/postgresqleu/urls.py b/postgresqleu/urls.py
index 0218330..b3cc0bb 100644
--- a/postgresqleu/urls.py
+++ b/postgresqleu/urls.py
@@ -24,7 +24,7 @@ import postgresqleu.paypal.views
 import postgresqleu.adyen.views
 import postgresqleu.accountinfo.views
 
-from postgresqleu.newsevents.feeds import LatestNews, LatestEvents
+from postgresqleu.newsevents.feeds import LatestNews
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
@@ -42,14 +42,8 @@ urlpatterns = [
 	url(r'^accounts/logout/$', postgresqleu.auth.logout),
 	url(r'^auth_receive/$', postgresqleu.auth.auth_receive),
 
-	# News & Events
-	url(r'^events$', postgresqleu.newsevents.views.eventlist),
-	url(r'^events/(\d+)$', postgresqleu.newsevents.views.event),
-	url(r'^events/archive$', postgresqleu.newsevents.views.eventarchive),
-
 	# Feeds
 	url(r'^feeds/news/$', LatestNews()),
-	url(r'^feeds/events/$', LatestEvents()),
 
 	# Conference registration
 	url(r'^events/(?P<confname>[^/]+)/register/(?P<whatfor>(self)/)?$', postgresqleu.confreg.views.home),