From 334df893b00e1c91606c5cfd21ca865da6ade2df Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 17:08:18 +0000
Subject: [PATCH] Update ProfileAbout.js

---
 client/src/components/profile/ProfileAbout.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/components/profile/ProfileAbout.js b/client/src/components/profile/ProfileAbout.js
index 0809936..a7a2ad3 100644
--- a/client/src/components/profile/ProfileAbout.js
+++ b/client/src/components/profile/ProfileAbout.js
@@ -31,8 +31,4 @@ ProfileAbout.propTypes = {
   profile: PropTypes.object.isRequired
 };
 
-<<<<<<< HEAD
 export default ProfileAbout;
-=======
-export default ProfileAbout;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb