Commit da0f9ba1 authored by liuyu's avatar liuyu

liuyu

parent 6af38a77
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
*/ */
#include "amf_n2.hpp" #include "amf_n2.hpp"
<<<<<<< HEAD
=======
#include <curl/curl.h> #include <curl/curl.h>
#include "amf_n1.hpp" #include "amf_n1.hpp"
#include "amf_n11.hpp" #include "amf_n11.hpp"
...@@ -39,7 +36,6 @@ ...@@ -39,7 +36,6 @@
#include "itti.hpp" #include "itti.hpp"
#include "itti_msg_amf_app.hpp" #include "itti_msg_amf_app.hpp"
#include "amf_config.hpp" #include "amf_config.hpp"
>>>>>>> amf_with_plugin
#include "DefaultPagingDRX.hpp" #include "DefaultPagingDRX.hpp"
#include "DownLinkNasTransport.hpp" #include "DownLinkNasTransport.hpp"
#include "InitialContextSetupRequest.hpp" #include "InitialContextSetupRequest.hpp"
...@@ -49,7 +45,6 @@ ...@@ -49,7 +45,6 @@
#include "Ngap_CauseNas.h" #include "Ngap_CauseNas.h"
#include "Ngap_CauseRadioNetwork.h" #include "Ngap_CauseRadioNetwork.h"
#include "Ngap_TimeToWait.h" #include "Ngap_TimeToWait.h"
<<<<<<< HEAD
#include "PDUSessionResourceHandoverCommandTransfer.hpp" #include "PDUSessionResourceHandoverCommandTransfer.hpp"
#include "PduSessionResourceReleaseCommand.hpp" #include "PduSessionResourceReleaseCommand.hpp"
#include "PduSessionResourceSetupRequest.hpp" #include "PduSessionResourceSetupRequest.hpp"
...@@ -63,11 +58,9 @@ ...@@ -63,11 +58,9 @@
#include "itti_msg_amf_app.hpp" #include "itti_msg_amf_app.hpp"
#include "logger.hpp" #include "logger.hpp"
#include "sctp_server.hpp" #include "sctp_server.hpp"
=======
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "Record.h" #include "Record.h"
>>>>>>> amf_with_plugin
extern "C" { extern "C" {
#include "dynamic_memory_check.h" #include "dynamic_memory_check.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment