From 8aac74a788760f3209f1da525eb4f44fb4b2f3ca Mon Sep 17 00:00:00 2001
From: 0xBhavik <62445791+bhavik-m@users.noreply.github.com>
Date: Wed, 16 Feb 2022 21:21:06 +0530
Subject: [PATCH] Update .gitignore

---
 .gitignore | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index edf87049..2aed425f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,8 +63,5 @@ build/contracts
 # buidler
 artifacts
 cache
-<<<<<<< HEAD
 typechain
-=======
-typechain
->>>>>>> 64d52604ec3f9c9172250d8ab60275599074af87
+