Skip to content

O
OpenXG UE
Commit 3d5af3e0 authored by Sakthivel Velumani's avatar Sakthivel Velumani
Browse files
Options

fixed merge

parent e8bacc9f
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 36 deletions
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
View file @ 3d5af3e0
......@@ -231,16 +231,10 @@ MACRLCs = (
L1s = (
{
<<<<<<< HEAD
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
=======
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
>>>>>>> origin/develop
}
);
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
View file @ 3d5af3e0
......@@ -215,16 +215,10 @@ MACRLCs = (
L1s = (
{
<<<<<<< HEAD
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
=======
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
>>>>>>> origin/develop
}
);
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
View file @ 3d5af3e0
......@@ -215,16 +215,10 @@ MACRLCs = (
L1s = (
{
<<<<<<< HEAD
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
=======
num_cc = 1;
tr_n_preference = "local_mac";
pusch_proc_threads = 8;
>>>>>>> origin/develop
}
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment