fix merges

solana-labs · Aug 21, 2022 · a9c60ad · a9c60ad
1 parent bac5297
commit a9c60ad
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
@@ -3264,7 +3264,6 @@ impl Bank {
         m.stop();
         metrics.store_vote_accounts_us.fetch_add(m.as_us(), Relaxed);
         vote_rewards
-<<<<<<< HEAD
     }
 
     fn update_reward_history(
@@ -3291,8 +3290,6 @@ impl Bank {
         metrics
             .store_stake_accounts_us
             .fetch_add(m.as_us(), Relaxed);
-=======
->>>>>>> c17f15a34f (Refactor epoch reward 2 (#27257))
     }
 
     fn update_reward_history(