fix merge conflict

fet2020/members/views.py

@@ -38,27 +38,6 @@ def index(request, slug=None, filter=None):
 
     return render(request, 'members/index.html', context)
 
-<<<<<<< HEAD
-def show_job(request, slug=None):
-    job=Job.objects.get(slug=slug)
-    return render(request, 'members/show_job.html', {"job": job})
-
-def show_member(request, slug=None):
-    member=Member.objects.get()
-    return render(request, 'members/show_member.html', {"member": member})
-
-def list(request, filter=None):
-    """
-        View for a list of members filtered or not
-    """
-    if filter is None: 
-        members = deque(Member.all_members.all())
-    if filter in Member.role_choices:
-        members=deque(Member.all_members.filter(role=filter).all())
-
-    return render(request, 'members/list.html',{"members": members})
-=======
->>>>>>> origin/master
 
 class MemberViewSet(viewsets.ModelViewSet):
     """