From d2952f0af1fb28e27ed500ee7e09e2af6508cd83 Mon Sep 17 00:00:00 2001
From: Priyatham Sai Chand <priyathamsaichand@gmail.com>
Date: Wed, 24 Mar 2021 13:09:32 +0530
Subject: [PATCH] merge git ignore

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 64d2f13..14eab3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
 client/node_modules
-<<<<<<< HEAD
 server/node_modules
-=======
-server/node_modules
->>>>>>> 68eacf2750f54cccc2941c4e9e5e454525c23bd3