forked from 42CTF/website
fixed merge conflict
This commit is contained in:
commit
06593b26f9
|
@ -16,7 +16,6 @@ from secrets import token_hex
|
|||
from accounts.models import UserProfileInfo
|
||||
|
||||
from django.contrib.auth.models import timezone
|
||||
import os
|
||||
|
||||
from . import connection
|
||||
|
||||
|
@ -155,6 +154,7 @@ def profile(request, user_name):
|
|||
|
||||
return render(request,'accounts/profile.html', {'user':user_obj, 'solves':solves,'solved':solved,'catsDatas': catsDatas, 'pointDatas': pointDatas,
|
||||
'rank': rank, 'score' : somme, 'member' : member, 'cats':cats})
|
||||
<<<<<<< HEAD
|
||||
|
||||
@login_required
|
||||
def delete_account(request):
|
||||
|
@ -182,4 +182,4 @@ def rank(request, token):
|
|||
break
|
||||
rank += 1
|
||||
data = {"rank": rank}
|
||||
return JsonResponse(data)
|
||||
return JsonResponse(data)
|
||||
|
|
Loading…
Reference in New Issue