Merge branch 'develop' into feature-pep8-fixes

members/urls.py

@@ -18,8 +18,7 @@ from members.views import member_update
 from members.views import member_delete_confirm
 from members.views import member_delete
 from members.views import payment_list
-from members.views import member_duplicates
-from members.views import resolve_conflict
+from members.views import add_many_confirm
 
 # rest api
 from members.views import MemberDetail
@@ -93,6 +92,9 @@ urlpatterns = [
     # delete confirmation view
     url(r'^delete_payment_confirm/(?P<index>\d+)$', payment_delete_confirm),
 
+    # post endpoint for confirming multiple entries
+    url(r'^add_many_confirm$', add_many_confirm),
+
     # settings page
     url(r'^settings$', settings_page),
 
@@ -108,10 +110,4 @@ urlpatterns = [
     # rest api url
     url(r'^api/members/(?P<pk>\d+)$', MemberDetail.as_view()),
 
-    # member duplicate resolution view
-    url(r'^duplicates$', member_duplicates),
-
-    # post target for resolving a conflict
-    url(r'^resolve_conflict$', resolve_conflict)
-
 ]