From c60314c4a16091c2240e43102ebaf93ae4eba1f4 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Mon, 13 Dec 2021 08:48:39 -0700
Subject: [PATCH] Revert "Update builtins.rs"

This reverts commit a54fa45d5ad6fc4d8f9acd4addf2e54441f04717.
---
 ledger/src/builtins.rs | 7 +++++++
 1 file changed, 7 insertions(+)

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