|
@@ -17,7 +17,6 @@ def index(request):
|
|
|
def detail(request):
|
|
|
|
|
|
membership_info_url = settings.MEMBER_MEMBERSHIP_INFO_URL
|
|
|
-<<<<<<< HEAD
|
|
|
context={
|
|
|
'membership_info_url': membership_info_url,
|
|
|
}
|
|
@@ -38,10 +37,6 @@ def detail(request):
|
|
|
context['form'] = form
|
|
|
|
|
|
return render(request, 'members/detail.html', context)
|
|
|
-=======
|
|
|
- return render(request, 'members/detail.html',
|
|
|
- {'membership_info_url': membership_info_url})
|
|
|
->>>>>>> origin/registration
|
|
|
|
|
|
|
|
|
@login_required
|