maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integration fix: fix bad merge conflict resolution + fix compilation error

Browse Source
This commit is contained in:
Cedric Roux
2018-09-07 16:57:55 +02:00
parent afb2fd4012
commit 73da898f9b
3 changed files with 2 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/ocp_itti/all_msg.h
+1
View File
@@ -12,3 +12,4 @@
#include "openair2/COMMON/sctp_messages_def.h"
#include "openair2/COMMON/udp_messages_def.h"
#include "openair2/COMMON/gtpv1_u_messages_def.h"
#include "openair2/COMMON/flexran_messages_def.h"