yarn generate

zeta-chain · Aug 14, 2023 · 61ba65a · 61ba65a
1 parent 40a3ae5
commit 61ba65a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/contracts/zevm/ZRC20.sol b/contracts/zevm/ZRC20.sol
@@ -17,13 +17,8 @@ interface ZRC20Errors {
     error ZeroAddress();
 }
 
-<<<<<<< HEAD
-contract ZRC20 is Context, IZRC20, IZRC20Metadata, ZRC20Errors {
-    /// @notice The fungible module address, this is maintained at the protocol level and is always constant
-=======
 contract ZRC20 is IZRC20, IZRC20Metadata, ZRC20Errors {
     /// @notice Fungible address is always the same, maintained at the protocol level
->>>>>>> main
     address public constant FUNGIBLE_MODULE_ADDRESS = 0x735b14BB79463307AAcBED86DAf3322B1e6226aB;
     /// @notice Chain id.abi
     uint256 public immutable CHAIN_ID;