Update builtins.rs

2021-11-29 22:50:41 -08:00
parent 713b61677e
commit a54fa45d5a
1 changed files with 0 additions and 7 deletions
--- a/ledger/src/builtins.rs
+++ b/ledger/src/builtins.rs
@ -1,15 +1,8 @@
-<<<<<<< HEAD
 use solana_runtime::{
    bank::{Builtin, Builtins},
    builtins::ActivationType,
 };
 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 {
    ($b:expr) => {