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

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

diff --git a/client/src/components/profile/ProfileGithub.js b/client/src/components/profile/ProfileGithub.js
index 67b374d..70e7557 100644
--- a/client/src/components/profile/ProfileGithub.js
+++ b/client/src/components/profile/ProfileGithub.js
@@ -48,8 +48,5 @@ const mapStateToProps = state => ({
   repos: state.profile.repos
 });
 
-<<<<<<< HEAD
 export default connect(mapStateToProps, { getGithubRepos })(ProfileGithub);
-=======
-export default connect(mapStateToProps, { getGithubRepos })(ProfileGithub);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+