42CTF/website
42CTF
/
website
13
5
Fork 10
Code Issues 10 Pull Requests 1 Projects 9 Releases Wiki Activity

fixed merge conflict

This commit is contained in:
Danhia 2022-02-17 23:59:21 +01:00
parent e8f5f33269 f0479f6577
commit 06593b26f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/accounts/views/views.py
View File

@ -16,7 +16,6 @@ from secrets import token_hex
from accounts.models import UserProfileInfo from accounts.models import UserProfileInfo
from django.contrib.auth.models import timezone from django.contrib.auth.models import timezone
import os
from . import connection 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, 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}) 'rank': rank, 'score' : somme, 'member' : member, 'cats':cats})
<<<<<<< HEAD
@login_required @login_required
def delete_account(request): def delete_account(request):
@ -182,4 +182,4 @@ def rank(request, token):
break break
rank += 1 rank += 1
data = {"rank": rank} data = {"rank": rank}
return JsonResponse(data) return JsonResponse(data)