Merge remote-tracking branch 'origin/fix-remove-lte-ran-file' into develop_integration_2018_w19
Conflicts: openair1/PHY/defs_eNB.h
Showing
This diff is collapsed.
Please register or sign in to comment
Conflicts: openair1/PHY/defs_eNB.h