resolving conflict 2

This commit is contained in:
h0x0er 2022-01-31 13:41:18 +05:30
commit 9b747556a5

2
.gitignore vendored
View file

@ -103,5 +103,3 @@ typings/
# TernJS port file
.tern-port
# vscode files
.vscode/