Merge conflicts resolved

2021-02-08 18:05:29 +05:30
parent a169d46415 403db5f66e
commit 0e6f1e6ad6
133 changed files with 11914 additions and 6808 deletions
@@ -285,7 +285,6 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
  tx_gain[0][CC_id]   = tx_gain[0][0];

  // Set UE variables
-
  UE->rx_total_gain_dB     = (int)rx_gain[CC_id][0] + rx_gain_off;
  UE->tx_total_gain_dB     = (int)tx_gain[CC_id][0];
  UE->tx_power_max_dBm     = tx_max_power[CC_id];