Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
37a18b25
Commit
37a18b25
authored
Jan 20, 2017
by
Cédric Roux
Browse files
integration fix: bad #if #endif position
parent
af676180
Changes
1
Hide whitespace changes
Inline
Side-by-side
openair1/PHY/MODULATION/beamforming.c
View file @
37a18b25
...
...
@@ -115,9 +115,9 @@ int beam_precoding(int32_t **txdataF,
}
}*/
>>>>>>> enhancement-192-beamforming
#endif
}
}
#endif
return
0
;
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment