From a9c60adfc930a49f40e9a7452b619071debda4aa Mon Sep 17 00:00:00 2001
From: haoran <haoran@mbook>
Date: Sun, 21 Aug 2022 16:37:43 -0500
Subject: [PATCH] fix merges

---
 runtime/src/bank.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 14e1d42d896abc..cd7ac186ba00c1 100644
--- 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(