From 45295ddfde708d2b291fde730d66c3a925380a06 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 17:00:40 +0000
Subject: [PATCH] Update Post.js

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

diff --git a/client/src/components/post/Post.js b/client/src/components/post/Post.js
index b901859..1f3e790 100644
--- a/client/src/components/post/Post.js
+++ b/client/src/components/post/Post.js
@@ -41,8 +41,5 @@ const mapStateToProps = (state) => ({
   post: state.post
 });
 
-<<<<<<< HEAD
 export default connect(mapStateToProps, { getPost })(Post);
-=======
-export default connect(mapStateToProps, { getPost })(Post);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+