fix some merge errors

2020-08-29 12:00:58 +00:00
parent beec3bf3e7
commit 04e7bb911b
5 changed files with 7 additions and 35 deletions
--- a/fet2020/members/views.py
+++ b/fet2020/members/views.py
@@ -10,10 +10,6 @@ from rest_framework import permissions
 # from django_filters.rest_framework import DjangoFilterBackend


-<<<<<<< HEAD
-def show(request,nickname=None):
-    return render(request, 'members/index.html', context)
-

 def index(request, slug=None, filter=None):
    job_group = deque(JobGroup.objects.all())