astyle applied

bfb65b57 · Louis Adrien Dufrene · 6a3687fe · bfb65b57 · bfb65b57
Commit bfb65b57 authored Nov 16, 2018 by Louis Adrien Dufrene
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

openair2/ENB_APP/enb_config.c openair2/ENB_APP/enb_config.c +1 -1

targets/RT/USER/lte-enb.c targets/RT/USER/lte-enb.c +0 -2

No files found.
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -684,8 +684,6 @@ void wakeup_prach_eNB_br(PHY_VARS_eNB *eNB,RU_t *ru,int frame,int subframe) {
    }
  }

-  <<<<<<< HEAD
-
  // check if we have to detect PRACH first
  if (is_prach_subframe(fp,frame,subframe)>0) {
    LOG_D(PHY,"Triggering prach br processing, frame %d, subframe %d\n",frame,subframe);