From e7f53182e223bb24bc89432e22f3d8ad64ac58ef Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)"
 <75863576+jeffwashington@users.noreply.github.com>
Date: Thu, 4 Feb 2021 09:20:50 -0600
Subject: [PATCH] fix merge conflict (#15085)

---
 runtime/src/accounts_db.rs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 253dceb8f1..7eada8101a 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -313,16 +313,6 @@ impl<'a> LoadedAccount<'a> {
             },
         }
     }
-
-    pub fn lamports(&self) -> u64 {
-        match self {
-            LoadedAccount::Stored(stored_account_meta) => stored_account_meta.account_meta.lamports,
-            LoadedAccount::Cached((_, cached_account)) => match cached_account {
-                Cow::Owned(cached_account) => cached_account.account.lamports,
-                Cow::Borrowed(cached_account) => cached_account.account.lamports,
-            },
-        }
-    }
 }
 
 #[derive(Clone, Default, Debug)]