From 4b3ea9fd384cbfa0a67905460aa573f258aa7cc3 Mon Sep 17 00:00:00 2001 From: Ashwin Sekar Date: Mon, 22 Apr 2024 23:25:17 +0000 Subject: [PATCH] fix feature_set conflicts --- sdk/src/feature_set.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs index cc8852667e90cd..d6394ec1a0e454 100644 --- a/sdk/src/feature_set.rs +++ b/sdk/src/feature_set.rs @@ -980,11 +980,7 @@ lazy_static! { (enable_gossip_duplicate_proof_ingestion::id(), "enable gossip duplicate proof ingestion #32963"), (enable_chained_merkle_shreds::id(), "Enable chained Merkle shreds #34916"), (deprecate_unused_legacy_vote_plumbing::id(), "Deprecate unused legacy vote tx plumbing"), -<<<<<<< HEAD -======= - (enable_tower_sync_ix::id(), "Enable tower sync vote instruction"), (chained_merkle_conflict_duplicate_proofs::id(), "generate duplicate proofs for chained merkle root conflicts"), ->>>>>>> 411fdc9312 (blockstore: scaffolding for chained merkle root conflict detection (#719)) /*************** ADD NEW FEATURES HERE ***************/ ] .iter()