push changes

kalviumcommunity · Dec 24, 2024 · ea5fb77 · ea5fb77
2 parents 6cadac8 + 4f196d8
commit ea5fb77
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Desktop/Capstoneproject/Squad56_AryaPatil_Capstone_ConnectBloom b/Desktop/Capstoneproject/Squad56_AryaPatil_Capstone_ConnectBloom
diff --git a/client/.gitignore b/client/.gitignore
@@ -7,7 +7,10 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
+/node_modules
+
 node_modules
+package-lock.json
 dist
 dist-ssr 
 *.local

diff --git a/server/.gitignore b/server/.gitignore
@@ -1,7 +1,15 @@
-<<<<<<< HEAD
+
 /node_modules 
-=======
+
 /node_modules  
 .env
->>>>>>> 84603906b72a16ab4091113c3dd50b5d3711f52a
+84603906b72a16ab4091113c3dd50b5d3711f52a
+
+
+/node_modules 
+
+/node_modules  
+.env
+
+4f196d8c20c6cb4fce1a735895a19b73a143b3c7
 package-lock.json