From a54fa45d5ad6fc4d8f9acd4addf2e54441f04717 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 29 Nov 2021 22:50:41 -0800
Subject: [PATCH] Update builtins.rs

---
 ledger/src/builtins.rs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ledger/src/builtins.rs b/ledger/src/builtins.rs
index 6e8d8f090b..6896ccfa39 100644
--- 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) => {