From 13263e7abcf5874025fd23ec15744ccbc41edf85 Mon Sep 17 00:00:00 2001
From: Priyatham-sai-chand <priyathamsaichand@gmail.com>
Date: Wed, 24 Mar 2021 23:33:00 +0530
Subject: [PATCH] ignore server modules

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 08ac508..d40e24c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 # dependencies
 client/node_modules
+<<<<<<< HEAD
 client/.pnp
 client/.env
 /client.pnp.js
@@ -30,3 +31,7 @@ server\node_modules
 client/node_modules
 server/node_modules
 >>>>>>> git ignore node modules
+=======
+server/node_modules
+node_modules
+>>>>>>> ignore server modules