removed merge artifact
This commit is contained in:
parent
06593b26f9
commit
eac835bef5
|
@ -154,7 +154,6 @@ 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):
|
||||
|
|
Loading…
Reference in New Issue