Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

vacancies_and_studentships/urls.py minor conflict resolved

  • Loading branch information...
commit d363f25a7209b43ef66e43c25862215a01152815 2 parents a154ccd + 24a2040
@evildmp authored
Showing with 5 additions and 3 deletions.
  1. +5 −3 vacancies_and_studentships/urls.py
View
8 vacancies_and_studentships/urls.py
@@ -10,8 +10,10 @@
# entities' vacancies and studentships
url(r'^archived-vacancies/(?:(?P<slug>[-\w]+)/)?$', views.archived_vacancies, name="archived_vacancies"),
url(r'^all-open-vacancies/(?:(?P<slug>[-\w]+)/)?$', views.all_current_vacancies, name="all_current_vacancies"),
- url(r'^archived-studentships/(?:(?P<slug>[-\w]+)/)?$', views.archived_studentships, name="archived_studentships"),
+
+url(r'^archived-studentships/(?:(?P<slug>[-\w]+)/)?$', views.archived_studentships, name="archived_studentships"),
url(r"^all-open-studentships/(?:(?P<slug>[-\w]+)/)?$", views.all_current_studentships, name="all_current_studentships"),
- url(r"^vacancies-and-studentships/(?:(?P<slug>[-\w]+)/)?$", views.vacancies_and_studentships, name="vacancies_and_studentships"),
+
+url(r"^vacancies-and-studentships/(?:(?P<slug>[-\w]+)/)?$", views.vacancies_and_studentships, name="vacancies_and_studentships"),
)
-
+
Please sign in to comment.
Something went wrong with that request. Please try again.