rebased ngap reset all

Signed-off-by: aniket021997 <aniket.sonawane@wavelabs.ai>
magma · Apr 15, 2022 · 3f156fb · 3f156fb
1 parent de8fb19
commit 3f156fb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lte/gateway/c/core/oai/tasks/amf/amf_app_handler.cpp b/lte/gateway/c/core/oai/tasks/amf/amf_app_handler.cpp
@@ -45,7 +45,7 @@ extern "C" {
 #include "lte/gateway/c/core/oai/tasks/amf/amf_common.h"
 #include "lte/gateway/c/core/oai/include/map.h"
 #include "lte/gateway/c/core/oai/tasks/amf/include/amf_client_servicer.hpp"
->>>>>>> feat(ngap): NGAP Reset ALL
+#include "lte/gateway/c/core/oai/include/ngap_messages_types.h"
 
 extern amf_config_t amf_config;
 extern amf_config_t amf_config;