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

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

diff --git a/client/src/components/layout/NotFound.js b/client/src/components/layout/NotFound.js
index df23b1d..7a243da 100644
--- a/client/src/components/layout/NotFound.js
+++ b/client/src/components/layout/NotFound.js
@@ -11,8 +11,4 @@ const NotFound = () => {
   );
 };
 
-<<<<<<< HEAD
 export default NotFound;
-=======
-export default NotFound;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb