fix feature_set conflicts

anza-xyz · Apr 23, 2024 · 4b3ea9f · 4b3ea9f
1 parent d14a184
commit 4b3ea9f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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()