Commit bdd68845 authored by juvancic's avatar juvancic
Browse files

encdec merge

parent 786dfddd

ttcn/Lib3GPP/NG_NAS/NG_NAS_MsgContainers.ttcn

+0 −4
Original line number Original line Diff line number Diff line
@@ -114,10 +114,7 @@ module NG_NAS_MsgContainers 
    UE_TEST_LOOP_NR_SIDELINK_COUNTER_REQUEST               test_Loop_Sidelink_Counter_Request, // @sic R5-225291 sic@

    UE_TEST_LOOP_NR_SIDELINK_COUNTER_REQUEST               test_Loop_Sidelink_Counter_Request, // @sic R5-225291 sic@





    UPDATE_UE_LOCATION_INFORMATION                         update_Ue_Location_Information   //@sic R5-213421 sic@

    UPDATE_UE_LOCATION_INFORMATION                         update_Ue_Location_Information   //@sic R5-213421 sic@

<<<<<<< HEAD





  }

=======

  } with { 

  } with { 

    variant "TAG(

    variant "TAG(

      security_Protected_Nas_Message, securityHeaderType = '0001'B;

      security_Protected_Nas_Message, securityHeaderType = '0001'B;
@@ -131,7 +128,6 @@ module NG_NAS_MsgContainers 
      dl_Nas_Transport,               messageType = '01101000'B;

      dl_Nas_Transport,               messageType = '01101000'B;

      )"

      )"

    }

    }

>>>>>>> 22d86add030cd3da835e95ca682f86332b832143









  //****************************************************************************

  //****************************************************************************