From de6297755339c3c32d722c5d224a7159740d2640 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 17:01:03 +0000
Subject: [PATCH] Update PostForm.js

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

diff --git a/client/src/components/posts/PostForm.js b/client/src/components/posts/PostForm.js
index af41cec..72484f9 100644
--- a/client/src/components/posts/PostForm.js
+++ b/client/src/components/posts/PostForm.js
@@ -41,8 +41,4 @@ PostForm.propTypes = {
 export default connect(
   null,
   { addPost }
-<<<<<<< HEAD
 )(PostForm);
-=======
-)(PostForm);
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb