fix: conflict resolution

Signed-off-by: Dori Medini <[email protected]>

Cargo.toml

@@ -4,74 +4,7 @@
 resolver = "2"
 
 members = [
-<<<<<<< HEAD
-    "crates/batcher",
-    "crates/blockifier",
-    "crates/committer",
-    "crates/committer_cli",
-    "crates/gateway",
-    "crates/mempool",
-    "crates/mempool_infra",
-    "crates/mempool_node",
-    "crates/mempool_test_utils",
-    "crates/mempool_types",
-    "crates/native_blockifier",
-    "crates/papyrus_base_layer",
-    "crates/papyrus_common",
-    "crates/papyrus_config",
-    "crates/papyrus_execution",
-    "crates/papyrus_load_test",
-    "crates/papyrus_monitoring_gateway",
-    "crates/papyrus_network",
-    "crates/papyrus_node",
-    "crates/papyrus_p2p_sync",
-    "crates/papyrus_proc_macros",
-    "crates/papyrus_protobuf",
-    "crates/papyrus_rpc",
-    "crates/papyrus_storage",
-    "crates/papyrus_sync",
-    "crates/papyrus_test_utils",
-    "crates/sequencing/papyrus_block_builder",
-    "crates/sequencing/papyrus_consensus",
-    "crates/starknet_api",
-    "crates/starknet_client",
-    "crates/starknet_sierra_compile",
-    "crates/task_executor",
-    "crates/tests-integration",
-||||||| 7ee04dbc
-    "crates/blockifier",
-    "crates/committer",
-    "crates/committer_cli",
-    "crates/gateway",
-    "crates/mempool",
-    "crates/mempool_infra",
-    "crates/mempool_node",
-    "crates/mempool_test_utils",
-    "crates/mempool_types",
-    "crates/native_blockifier",
-    "crates/papyrus_base_layer",
-    "crates/papyrus_common",
-    "crates/papyrus_config",
-    "crates/papyrus_execution",
-    "crates/papyrus_load_test",
-    "crates/papyrus_monitoring_gateway",
-    "crates/papyrus_network",
-    "crates/papyrus_node",
-    "crates/papyrus_p2p_sync",
-    "crates/papyrus_proc_macros",
-    "crates/papyrus_protobuf",
-    "crates/papyrus_rpc",
-    "crates/papyrus_storage",
-    "crates/papyrus_sync",
-    "crates/papyrus_test_utils",
-    "crates/sequencing/papyrus_block_builder",
-    "crates/sequencing/papyrus_consensus",
-    "crates/starknet_api",
-    "crates/starknet_client",
-    "crates/starknet_sierra_compile",
-    "crates/task_executor",
-    "crates/tests-integration",
-=======
+  "crates/batcher",
   "crates/blockifier",
   "crates/committer",
   "crates/committer_cli",
@@ -104,7 +37,6 @@ members = [
   "crates/starknet_sierra_compile",
   "crates/task_executor",
   "crates/tests-integration",
->>>>>>> origin/main-v0.13.2
 ]
 
 [workspace.package]

crates/mempool_types/Cargo.toml

@@ -11,11 +11,7 @@ workspace = true
 [dependencies]
 async-trait.workspace = true
 mockall.workspace = true
-<<<<<<< HEAD
 serde = { workspace = true, feat = ["derive"] }
-||||||| 7ee04dbc
-=======
 starknet_api = { path = "../starknet_api", version = "0.13.0-rc.0" }
->>>>>>> origin/main-v0.13.2
 starknet_mempool_infra = { path = "../mempool_infra" }
 thiserror.workspace = true

crates/papyrus_network/Cargo.toml

@@ -8,50 +8,18 @@ license-file.workspace = true
 [features]
 testing = []
 
-<<<<<<< HEAD
-||||||| 7ee04dbc
-[[bin]]
-name = "streamed_bytes_benchmark"
-required-features = ["clap"]
-path = "src/bin/streamed_bytes_benchmark.rs"
-
-=======
 [[bin]]
 name = "streamed_bytes_benchmark"
 path = "src/bin/streamed_bytes_benchmark.rs"
 required-features = ["clap"]
 
->>>>>>> origin/main-v0.13.2
 [dependencies]
 async-stream.workspace = true
 bytes.workspace = true
 derive_more.workspace = true
 futures.workspace = true
 lazy_static.workspace = true
 libp2p = { workspace = true, features = [
-<<<<<<< HEAD
-    "gossipsub",
-    "identify",
-    "kad",
-    "macros",
-    "noise",
-    "quic",
-    "serde",
-    "tcp",
-    "tokio",
-    "yamux",
-||||||| 7ee04dbc
-    "gossipsub",
-    "identify",
-    "kad",
-    "macros",
-    "noise",
-    "quic",
-    "tcp",
-    "tokio",
-    "yamux",
-    "serde",
-=======
   "gossipsub",
   "identify",
   "kad",
@@ -62,7 +30,6 @@ libp2p = { workspace = true, features = [
   "tcp",
   "tokio",
   "yamux",
->>>>>>> origin/main-v0.13.2
 ] }
 metrics.workspace = true
 papyrus_common = { path = "../papyrus_common", version = "0.4.0-rc.0" }