Conflicts: cmake_targets/CMakeLists.txt cmake_targets/build_oai openair1/PHY/LTE_TRANSPORT/pucch.c openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/eNB_scheduler_ulsch.c targets/RT/USER/lte-softmodem.c
