fix some merge errors

solana-labs · Jun 16, 2021 · c2722c2 · c2722c2
1 parent 783a835
commit c2722c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/core/tests/snapshots.rs b/core/tests/snapshots.rs
@@ -167,11 +167,8 @@ mod tests {
             AccountSecondaryIndexes::default(),
             false,
             None,
-<<<<<<< HEAD
-            check_hash_calculation,
-=======
             accounts_db::AccountShrinkThreshold::default(),
->>>>>>> 269d99583 (Make account shrink configurable #17544 (#17778))
+            check_hash_calculation,
         )
         .unwrap();
 

diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs
@@ -142,11 +142,8 @@ fn load_from_snapshot(
         process_options.account_indexes.clone(),
         process_options.accounts_db_caching_enabled,
         process_options.limit_load_slot_count_from_snapshot,
-<<<<<<< HEAD
-        process_options.accounts_db_test_hash_calculation,
-=======
         process_options.shrink_ratio,
->>>>>>> 269d99583 (Make account shrink configurable #17544 (#17778))
+        process_options.accounts_db_test_hash_calculation,
     )
     .expect("Load from snapshot failed");
     if let Some(shrink_paths) = shrink_paths {