From eac835bef51cfa7565bc5f9bf1d4931dcf7c8ed2 Mon Sep 17 00:00:00 2001
From: Danhia <danhia@protonmail.com>
Date: Fri, 18 Feb 2022 10:55:54 +0100
Subject: [PATCH] removed merge artifact

---
 src/accounts/views/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/accounts/views/views.py b/src/accounts/views/views.py
index 895ebe7..392e6ba 100644
--- 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):