commit

openair2/LAYER2/MAC/pre_processor.c

@@ -505,19 +505,11 @@ skip_ue:
    //* 分配的结果：将结果都存储到了 ue_ctrl->rballoc_sub_UE[CC_id][rbg] 之中!!!，最后所有rbg都分配
    
 }
-<<<<<<< HEAD
 default_sched_dl_algo_t round_robin_dl = {
   .name  = "round_robin_dl",
   .setup = rr_dl_setup,
   .unset = rr_dl_unset,
   .run   = rr_dl_run,
-=======
-default_sched_dl_algo_t ai_dl = {
-  .name  = "ai_dl",
-  .setup = ai_dl_setup,
-  .unset = ai_dl_unset,
-  .run   = ai_dl_run,
->>>>>>> ade89ea2c860b72d368b3c03089889a6211e9255
   .data  = NULL
 };