removes backport merge conflicts

solana-labs · Jan 3, 2022 · d9a4f62 · d9a4f62
1 parent 834eafe
commit d9a4f62
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/runtime/src/block_cost_limits.rs b/runtime/src/block_cost_limits.rs
@@ -59,9 +59,6 @@ pub const MAX_BLOCK_UNITS: u64 =
 /// limit is to prevent too many transactions write to same account, therefore
 /// reduce block's parallelism.
 pub const MAX_WRITABLE_ACCOUNT_UNITS: u64 = MAX_BLOCK_REPLAY_TIME_US * COMPUTE_UNIT_TO_US_RATIO;
-<<<<<<< HEAD
-=======
 
 /// max length of account data in a slot (bytes)
 pub const MAX_ACCOUNT_DATA_LEN: u64 = 100_000_000;
->>>>>>> d743c2917 (re-calibrate limit based on mainnet data, see issue #21917)