Remove merge conflict

ethereum · Apr 12, 2023 · 745396d · 745396d
1 parent cf9c3f3
commit 745396d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/web3/_utils/method_formatters.py b/web3/_utils/method_formatters.py
@@ -94,10 +94,7 @@
 )
 from web3.exceptions import (
     BlockNotFound,
-<<<<<<< HEAD
-=======
     ContractCustomError,
->>>>>>> a3ac3a0d (Add tests around custom error revert)
     ContractLogicError,
     OffchainLookup,
     TransactionNotFound,