fix merge

anza-xyz · Jan 24, 2025 · c6d7105 · c6d7105
1 parent 9f07afb
commit c6d7105
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/sdk/feature-set/src/lib.rs b/sdk/feature-set/src/lib.rs
@@ -1154,7 +1154,6 @@ lazy_static! {
         (reserve_minimal_cus_for_builtin_instructions::id(), "Reserve minimal CUs for builtin instructions SIMD-170 #2562"),
         (raise_block_limits_to_50m::id(), "Raise block limit to 50M SIMD-0207"),
         (fix_alt_bn128_multiplication_input_length::id(), "fix alt_bn128 multiplication input length SIMD-0222 #3686"),
-        (disable_intrabatch_account_locks::id(), "Allow batched transactions to read/write and write/write the same accounts SIMD-0083"),
         (relax_intrabatch_account_locks::id(), "Allow batched transactions to read/write and write/write the same accounts SIMD-0083"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]