Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openairinterface5G
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

09344667

Commit 09344667 authored 4 years ago by Francesco Mani

Downloads
- Patches
- Plain Diff

fix for unresolved conflict

parent 0be0b4e0

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

openair1/SIMULATION/TOOLS/random_channel.c 1 addition, 5 deletions

openair1/SIMULATION/TOOLS/random_channel.c
targets/ARCH/rfsimulator/simulator.c 1 addition, 0 deletions

targets/ARCH/rfsimulator/simulator.c

with 2 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment