fix merge conflict (#15085)

2021-02-04 09:20:50 -06:00 · 2021-02-04 09:20:50 -06:00 · e7f53182e2
parent 600ff0d915
commit e7f53182e2
1 changed files with 0 additions and 10 deletions
--- 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)]