fix conflicts

src/smf_app/smf_config.cpp

@@ -901,9 +901,7 @@ void smf_config::display() {
     n4.thread_rd_sched_params.sched_policy); Logger::smf_app().info( "
     Scheduling prio .....: %d", n4.thread_rd_sched_params.sched_priority);
 
-<<<<<<< HEAD
-    Logger::smf_app().info("- ITTI Timer Task Threading:");
-=======
+
   Logger::smf_app().info(
       "   CSCF .........: %s",
       inet_ntoa(*((struct in_addr*) &default_cscfv4)));
@@ -914,7 +912,6 @@ void smf_config::display() {
   Logger::smf_app().info("- " SMF_CONFIG_STRING_DNN_LIST ":");
   for (int i = 0; i < num_dnn; i++) {
     Logger::smf_app().info("    DNN %d:", i);
->>>>>>> 89b5f827... backup before adding qos rule update
     Logger::smf_app().info(
         "    CPU id ..............: %d", itti.itti_timer_sched_params.cpu_id);
     Logger::smf_app().info(

src/smf_app/smf_config.hpp

@@ -225,10 +225,7 @@ class smf_config {
   struct in_addr default_cscfv4;
   struct in6_addr default_dnsv6;
   struct in6_addr default_dns_secv6;
-<<<<<<< HEAD
-
   std::map<std::string, dnn_t> dnns;
-=======
   struct in6_addr default_cscfv6;
 #define SMF_NUM_DNN_MAX 5
   int num_dnn;
@@ -256,7 +253,6 @@ class smf_config {
   int num_paa6_pool;
   struct in6_addr paa_pool6_prefix[SMF_NUM_UE_POOL_MAX];
   uint8_t paa_pool6_prefix_len[SMF_NUM_UE_POOL_MAX];
->>>>>>> 89b5f827... backup before adding qos rule update
 
   bool force_push_pco;
   uint ue_mtu;