Fixed merge conflict at urls.py

sikweb/urls.py

@@ -31,7 +31,9 @@ from members.views import new_member_request
 from members.views import member_requests
 #infoscreen
 from infoscreen.views import index as infoindex
+from infoscreen.views import default as infodefault
 from infoscreen.views import abb_job_list
+from infoscreen.views import rotation
 #application
 from members.views import applicationindex
 
@@ -53,8 +55,10 @@ urlpatterns = [
     url(r'^members/api/request$', new_member_request),
     url(r'^members/api/request/(?P<idx>\d+)$', handle_mem_request),
     #infoscreen
-    url(r'^infoscreen/$', infoindex),
+    url(r'^infoscreen/$', infodefault),
+    url(r'^infoscreen/(?P<idx>\d+)$', infoindex),
     url(r'^infoscreen/abbjobs$', abb_job_list),
+	url(r'^infoscreen/rotation/(?P<idx>\d+)$', rotation),
 	#application
 	url(r'^application/$', applicationindex),
 ]