fix for unresolved conflict

This commit is contained in:
Francesco Mani
2020-08-21 15:08:26 +02:00
parent 0be0b4e0e3
commit 09344667c3
2 changed files with 2 additions and 5 deletions
+1
View File
@@ -332,6 +332,7 @@ static int rfsimu_setchanmod_cmd(char *buff, int debug, telnet_printfunc_t prnt,
channelmod,
t->sample_rate,
t->tx_bw,
30e-9, // TDL delay-spread parameter
t->chan_forgetfact, // forgetting_factor
t->chan_offset, // maybe used for TA
t->chan_pathloss); // path_loss in dB