Merge branch 'main' into bot-api

2022-02-18 11:11:58 +01:00 · 2022-02-18 11:11:58 +01:00 · 3b86441259
parent 7b2552f0b5 eac835bef5
commit 3b86441259
1 changed files with 0 additions and 1 deletions
--- a/src/accounts/views/views.py
+++ b/src/accounts/views/views.py
@ -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):