From d1b1ef181a4bd59fb2036c340a57bb0195045762 Mon Sep 17 00:00:00 2001
From: Francisco Paisana <francisco.paisana@softwareradiosystems.com>
Date: Thu, 23 Sep 2021 19:11:31 +0200
Subject: [PATCH] fix conflicts in rebasing

---
 srsenb/src/stack/mac/nr/mac_nr.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/srsenb/src/stack/mac/nr/mac_nr.cc b/srsenb/src/stack/mac/nr/mac_nr.cc
index 69aa970ff..c8eff7765 100644
--- a/srsenb/src/stack/mac/nr/mac_nr.cc
+++ b/srsenb/src/stack/mac/nr/mac_nr.cc
@@ -130,12 +130,6 @@ int mac_nr::ue_cfg(uint16_t rnti, const sched_nr_interface::ue_cfg_t& ue_cfg)
   return SRSRAN_SUCCESS;
 }
 
-int mac_nr::rlc_buffer_state(uint16_t rnti, uint32_t lcid, uint32_t tx_queue, uint32_t retx_queue)
-{
-  sched.dl_buffer_state(rnti, lcid, tx_queue, retx_queue);
-  return SRSRAN_SUCCESS;
-}
-
 uint16_t mac_nr::reserve_rnti(uint32_t enb_cc_idx)
 {
   uint16_t rnti = alloc_ue(enb_cc_idx);