chore: merge branch main-v0.13.2 into main (resolve conflicts)

reilabs · Jul 18, 2024 · a03232e · a03232e
1 parent 5cff676
commit a03232e
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/crates/blockifier/src/test_utils.rs b/crates/blockifier/src/test_utils.rs
@@ -47,15 +47,9 @@ pub const TEST_ERC20_CONTRACT_CLASS_HASH: &str = "0x1010";
 pub const ERC20_CONTRACT_PATH: &str = "./ERC20/ERC20_Cairo0/ERC20_without_some_syscalls/ERC20/\
                                        erc20_contract_without_some_syscalls_compiled.json";
 
-<<<<<<< HEAD
-#[derive(Clone, Hash, PartialEq, Eq, Copy, Debug)]
-||||||| 7e872363
-#[derive(Clone, Copy, Debug)]
-=======
 // TODO(Aviv, 14/7/2024): Move from test utils module, and use it in ContractClassVersionMismatch
 // error.
-#[derive(Clone, Copy, Debug)]
->>>>>>> origin/main-v0.13.2
+#[derive(Clone, Hash, PartialEq, Eq, Copy, Debug)]
 pub enum CairoVersion {
     Cairo0,
     Cairo1,