From 9e9232e11b00ede110d27e10b7c61abac71192dc Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 16:59:59 +0000
Subject: [PATCH] Update CommentForm.js

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

diff --git a/client/src/components/post/CommentForm.js b/client/src/components/post/CommentForm.js
index f0004fa..7a3c381 100644
--- a/client/src/components/post/CommentForm.js
+++ b/client/src/components/post/CommentForm.js
@@ -41,8 +41,5 @@ CommentForm.propTypes = {
 export default connect(
   null,
   { addComment }
-<<<<<<< HEAD
 )(CommentForm);
-=======
-)(CommentForm);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
+