From 58e46e107c9c385629d27a4f56b824e39714d535 Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Thu, 16 Dec 2021 13:53:03 -0700
Subject: [PATCH] Revert "Revert "Update builtins.rs""

This reverts commit c60314c4a16091c2240e43102ebaf93ae4eba1f4.
---
 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) => {