Fixed conflicts.

Author: orizi

crates/bin/cairo-execute/Cargo.toml

@@ -8,25 +8,11 @@ description = "Executable for creating executables and running them for the Cair
 
 [dependencies]
 anyhow.workspace = true
-<<<<<<< HEAD
-bincode = { version = "2.0.1" }
+bincode.workspace = true
 cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.12.0-rc.1" }
 cairo-lang-executable = { path = "../../cairo-lang-executable", version = "~2.12.0-rc.1" }
 cairo-lang-execute-utils = { path = "../../cairo-lang-execute-utils", version = "~2.12.0-rc.1" }
 cairo-lang-runner = { path = "../../cairo-lang-runner", version = "~2.12.0-rc.1" }
-||||||| 575a816e8
-bincode = { version = "2.0.1" }
-cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.11.4" }
-cairo-lang-executable = { path = "../../cairo-lang-executable", version = "~2.11.4" }
-cairo-lang-execute-utils = { path = "../../cairo-lang-execute-utils", version = "~2.11.4" }
-cairo-lang-runner = { path = "../../cairo-lang-runner", version = "~2.11.4" }
-=======
-bincode.workspace = true
-cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.11.4" }
-cairo-lang-executable = { path = "../../cairo-lang-executable", version = "~2.11.4" }
-cairo-lang-execute-utils = { path = "../../cairo-lang-execute-utils", version = "~2.11.4" }
-cairo-lang-runner = { path = "../../cairo-lang-runner", version = "~2.11.4" }
->>>>>>> origin/main
 cairo-vm = { workspace = true, features = ["clap"] }
 clap.workspace = true
 num-bigint.workspace = true

crates/cairo-lang-starknet/test_data/libfuncs_coverage__libfuncs_coverage.contract_class.json

@@ -4,25 +4,11 @@
     "0x7",
     "0x0",
     "0x2",
-<<<<<<< HEAD
     "0xc",
     "0x0",
-    "0xc7c",
-    "0x384",
-    "0x27d",
-||||||| 575a816e8
-    "0xb",
-    "0x4",
-    "0xc7c",
-    "0x384",
-    "0x27d",
-=======
-    "0xb",
-    "0x4",
     "0xbdc",
     "0x424",
     "0x264",
->>>>>>> origin/main
     "0x52616e6765436865636b",
     "0x800000000000000100000000000000000000000000000000",
     "0x436f6e7374",

crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.contract_class.json

@@ -4,25 +4,11 @@
     "0x7",
     "0x0",
     "0x2",
-<<<<<<< HEAD
     "0xc",
     "0x0",
-    "0x320",
-    "0xe0",
-    "0x5d",
-||||||| 575a816e8
-    "0xb",
-    "0x4",
-    "0x320",
-    "0xe0",
-    "0x5d",
-=======
-    "0xb",
-    "0x4",
     "0x31b",
     "0xe5",
     "0x5c",
->>>>>>> origin/main
     "0x52616e6765436865636b",
     "0x800000000000000100000000000000000000000000000000",
     "0x436f6e7374",

crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.contract_class.json

@@ -4,25 +4,11 @@
     "0x7",
     "0x0",
     "0x2",
-<<<<<<< HEAD
     "0xc",
     "0x0",
-    "0x35d",
-    "0xa3",
-    "0x68",
-||||||| 575a816e8
-    "0xb",
-    "0x4",
-    "0x35d",
-    "0xa3",
-    "0x68",
-=======
-    "0xb",
-    "0x4",
     "0x357",
     "0xa9",
     "0x67",
->>>>>>> origin/main
     "0x52616e6765436865636b",
     "0x800000000000000100000000000000000000000000000000",
     "0x436f6e7374",

crates/cairo-lang-starknet/test_data/storage_accesses__storage_accesses.contract_class.json

@@ -4,25 +4,11 @@
     "0x7",
     "0x0",
     "0x2",
-<<<<<<< HEAD
     "0xc",
     "0x0",
-    "0x273",
-    "0x18d",
-    "0x5c",
-||||||| 575a816e8
-    "0xb",
-    "0x4",
-    "0x273",
-    "0x18d",
-    "0x5c",
-=======
-    "0xb",
-    "0x4",
     "0x241",
     "0x1bf",
     "0x5b",
->>>>>>> origin/main
     "0x52616e6765436865636b",
     "0x800000000000000100000000000000000000000000000000",
     "0x436f6e7374",