Commit e61b1c64 authored by canterburym's avatar canterburym
Browse files

Fixing merge conflicts

parents 23325466 e63de3ec

33128/r18/TS33128Payloads.asn

+19 −11
Original line number Diff line number Diff line
@@ -1499,12 +1499,14 @@ AMFRANTraceReport ::= SEQUENCE 
    rANUENGAPID                   [3] RANUENGAPID,

    traceRecordType               [4] TraceRecordType,

    traceDirection                [5] TraceDirection,

    traceActivationInfo         [6] TraceActivationInfo OPTIONAL,

    -- deprecatedTraceActivationInfo was deprecated in r18(18) version6(6) and shall not be reused.

    deprecatedTraceActivationInfo [6] TraceActivationInfo OPTIONAL,

    nGRANCGI                      [7] NCGI,

    globalRANNodeID               [8] GlobalRANNodeID,

    traceCollectionEntityInfo     [9] TraceCollectionEntityInfo OPTIONAL,

    aMFTraceData                  [10] XMLType,

    location                    [11] Location OPTIONAL

    location                      [11] Location OPTIONAL,

    traceActivation               [12] TraceActivation OPTIONAL

}



-- See clause 6.2.2.2.12 for details of this Structure
@@ -1645,6 +1647,8 @@ ServiceMessageIdentity ::= CHOICE 


TraceActivation ::= ExternalASNType



-- The TraceActivationInfo type was deprecated in r18(18) version6(6) and shall not be reused.

-- The TraceActivation type shall be used instead.

TraceActivationInfo ::= SEQUENCE

{

    nGRANTraceID                     [1] OCTET STRING (SIZE(8)),
@@ -7322,7 +7326,11 @@ MIMEBody ::= CHOICE 
-- =======================================================

ExternalASNType ::= SEQUENCE

{

<<<<<<< HEAD

    moduleIdentifier [1] OBJECT IDENTIFIER,

=======

    moduleIdentifier [1] OBJECT IDENTIFIER OPTIONAL,

>>>>>>> cr/33128/0576

    aSNReference     [2] ExternalASNReference OPTIONAL,

    encodedASNValue  [3] ExternalASNValue

}