From 32f054177d19f48219094d76b76a50f775ee1fa0 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 17:09:28 +0000
Subject: [PATCH] Update ProfileItem.js

---
 client/src/components/profiles/ProfileItem.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/client/src/components/profiles/ProfileItem.js b/client/src/components/profiles/ProfileItem.js
index 2fba35a..f55f44d 100644
--- a/client/src/components/profiles/ProfileItem.js
+++ b/client/src/components/profiles/ProfileItem.js
@@ -39,8 +39,5 @@ ProfileItem.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-<<<<<<< HEAD
 export default ProfileItem;
-=======
-export default ProfileItem;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+