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

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

diff --git a/client/src/components/profile/ProfileTop.js b/client/src/components/profile/ProfileTop.js
index a38adc5..e204846 100644
--- a/client/src/components/profile/ProfileTop.js
+++ b/client/src/components/profile/ProfileTop.js
@@ -48,8 +48,5 @@ ProfileTop.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-<<<<<<< HEAD
+
 export default ProfileTop;
-=======
-export default ProfileTop;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb