5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enb.conf.example: fix merge conflict

Browse Source
master
Andre Puschmann 3 years ago
parent edf0926a2f
commit 0cfcd612b0
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File

7
srsenb/enb.conf.example
Unescape Escape View File

@ -33,17 +33,10 @@ n_prb = 50
##################################################################### #####################################################################
# eNB configuration files # eNB configuration files
# #
<<<<<<< HEAD
# sib_config: SIB1, SIB2 and SIB3 configuration file
# note: when enabling mbms, use the sib.conf.mbsfn configuration file which includes SIB13
# rr_config: Radio Resources configuration file
# rb_config: SRB/DRB configuration file
=======
# sib_config: SIB1, SIB2 and SIB3 configuration file # sib_config: SIB1, SIB2 and SIB3 configuration file
# note: When enabling MBMS, use the sib.conf.mbsfn configuration file which includes SIB13 # note: When enabling MBMS, use the sib.conf.mbsfn configuration file which includes SIB13
# rr_config: Radio Resources configuration file # rr_config: Radio Resources configuration file
# rb_config: SRB/DRB configuration file # rb_config: SRB/DRB configuration file
>>>>>>> 613202716 (enb.conf: Fix typos and make layout consistent)
##################################################################### #####################################################################
[enb_files] [enb_files]
sib_config = sib.conf sib_config = sib.conf

Write Preview
Loading…
Cancel
Save