gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update builtins.rs

Browse Source
This commit is contained in:
Michael Vines
2021-11-29 22:50:41 -08:00
parent 713b61677e
commit a54fa45d5a
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ledger/src/builtins.rs
View File

@ -1,15 +1,8 @@
<<<<<<< HEAD
use solana_runtime::{ use solana_runtime::{
bank::{Builtin, Builtins}, bank::{Builtin, Builtins},
builtins::ActivationType, builtins::ActivationType,
}; };
use solana_sdk::{feature_set, pubkey::Pubkey}; use solana_sdk::{feature_set, pubkey::Pubkey};
=======
use {
solana_runtime::builtins::{ActivationType, Builtin, Builtins},
solana_sdk::pubkey::Pubkey,
};
>>>>>>> e31b469f5 (Quash M1 build warning)
macro_rules! to_builtin { macro_rules! to_builtin {
($b:expr) => { ($b:expr) => {