• Cedric Roux's avatar
    bugfix: fix bad conflict resolutions from previous commits · 2d6dd02b
    Cedric Roux authored
    Some more fixes for some bad conflict resolutions.
    
    I ran:
    
        git diff 2018.w04 2018.w05
    
    And saw some problems with config_sib2.
    
    There was also something strange in openair2/LAYER2/openair2_proc.c
    in the function dump_eNB_l2_stats. Maybe the fix is wrong for
    this one. To be checked.
    2d6dd02b
Name
Last commit
Last update
cmake_targets Loading commit data...
common Loading commit data...
nfapi Loading commit data...
openair1 Loading commit data...
openair2 Loading commit data...
openair3 Loading commit data...
svn2git Loading commit data...
targets Loading commit data...
.gitlab-ci.yml Loading commit data...
LICENSE Loading commit data...
NOTICE.txt Loading commit data...
README.txt Loading commit data...
maketags Loading commit data...
oaienv Loading commit data...
pre-commit Loading commit data...