From 17f18003c29bca1d992438eebaca939630272c22 Mon Sep 17 00:00:00 2001
From: h0x0er <jatink843@protonmail.com>
Date: Mon, 31 Jan 2022 13:43:29 +0530
Subject: [PATCH] resolving conflict 3

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

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