From 4f0db29b7341c4696a6dcb22573784360bdfa952 Mon Sep 17 00:00:00 2001
From: Erin Hales <36751902+ErinHales@users.noreply.github.com>
Date: Thu, 15 Jul 2021 13:45:21 -0600
Subject: [PATCH] fix: resolve-typechain-conflicts.sh (#492)

---
 resolve-typechain-conflicts.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resolve-typechain-conflicts.sh b/resolve-typechain-conflicts.sh
index 19e34a716..5161607a7 100644
--- a/resolve-typechain-conflicts.sh
+++ b/resolve-typechain-conflicts.sh
@@ -1,8 +1,7 @@
-rm -rf typescript/src/typechain
+git rm -rf typescript/typechain
 cd solidity/optics-core 
 hardhat compile
 cd ../optics-xapps
 hardhat compile
 cd ../..
-git add typescript/src/typechain
-git rebase --continue
\ No newline at end of file
+git add typescript/typechain