From 9b747556a5c92975007cde44b2dc76d2e673bde1 Mon Sep 17 00:00:00 2001
From: h0x0er <jatink843@protonmail.com>
Date: Mon, 31 Jan 2022 13:41:18 +0530
Subject: [PATCH] resolving conflict 2

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

diff --git a/.gitignore b/.gitignore
index 1ed7947..0853ad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,5 +103,3 @@ typings/
 # TernJS port file
 .tern-port
 
-# vscode files
-.vscode/
\ No newline at end of file