/portal/urls.py: Merge conflict solved

[myslice.git] / portal / urls.py

diff --git a/portal/urls.py b/portal/urls.py
index f0e5ecd..9882845 100644 (file)
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -23,6 +23,7 @@
 from django.conf.urls import patterns, include, url
 from portal           import views
 from portal.views     import  DashboardView, PresViewView
+from portal.views     import DashboardView, PresViewView, PlatformsView
 from portal.util      import TemplateView
 
 # DEPRECATED #named_register_forms = (
@@ -44,6 +45,7 @@ urlpatterns = patterns('',
     url(r'^dashboard/?$', DashboardView.as_view(), name='dashboard'),
     #url(r'^my_account/?$', MyAccountView.as_view(), name='my_account'),
     url(r'^account/?$', views.my_account),
+    url(r'^platforms/?$', PlatformsView.as_view(), name='platforms'),
     url(r'^acc_process/?$', views.acc_process),
     url(r'^register/?$', views.register_4m_f4f),
     #url(r'^reg_process/?$', views.reg_4m_f4f_process),