From 330819bda6c2986613cc598c43254707a200d921 Mon Sep 17 00:00:00 2001
From: Pavan Gandhi <pavangandhi100@gmail.com>
Date: Thu, 13 Aug 2020 19:35:06 +0530
Subject: [PATCH] Update .gitignore

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

diff --git a/.gitignore b/.gitignore
index 66f3aa2..88c580f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,9 @@
-<<<<<<< HEAD
 # Mac File
 */.DS_Store
 .DS_Store
-=======
+
 # For Mac User
 **/.DS_Store
->>>>>>> eee0166a4809dfba3eef67e4df71db3463d1a2b3
 
 # Logs
 logs
@@ -49,6 +47,7 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+.vscode/
 
 # Config file
 config/config.env