fix merging

This commit is contained in:
2017-06-13 10:48:04 +02:00
parent 69c95cfd37
commit 9447de4468
4 changed files with 19 additions and 17 deletions

View File

@ -43,4 +43,3 @@ urlpatterns = [
url(r'^membership/(?P<membership_id>[0-9]+)/edit$', UserTrombiEditMembershipView.as_view(), name='edit_membership'),
url(r'^membership/(?P<membership_id>[0-9]+)/delete$', UserTrombiDeleteMembershipView.as_view(), name='delete_membership'),
]