Commit e21af93b authored by canterburym's avatar canterburym
Browse files

Resolving merge conflicts again

parent 553fbb2a

33128/r18/TS33128Payloads.asn

+13 −13
Original line number Diff line number Diff line
@@ -238,18 +238,13 @@ XIRIEvent ::= CHOICE 
    -- RCS events, see clause 7.13.3

    rCSRegistration                                     [140] RCSRegistration,

    rCSMessage                                          [141] RCSMessage,

    rcsCapabilityDiscovery                              [142] RCSCapabilityDiscovery,

    rCSCapabilityDiscovery                              [142] RCSCapabilityDiscovery,

    rCSSessionEstablishment                             [143] RCSSessionEstablishment,

    rCSSessionModification                              [144] RCSSessionModification,

<<<<<<< HEAD

    rCSSessionRelease                                   [145] RCSSessionRelease,

    rCSStartOfInterceptionWithAlreadyRegisteredUE       [146] RCSStartOfInterceptionWithAlreadyRegisteredUE



    -- AMF events, see clause 6.2.2.2.X, continued from tag 139

    aMFUEPolicyTransfer                                 [147] AMFUEPolicyTransfer

=======

    rCSSessionRelease                                   [145] RCSSessionRelease

>>>>>>> faffcd9 (Update 33128/r18/TS33128Payloads.asn)

    aMFUEPolicyTransfer                                 [146] AMFUEPolicyTransfer

}



-- ==============
@@ -483,15 +478,10 @@ IRIEvent ::= CHOICE 
    rCSCapabilityDiscovery                              [142] RCSCapabilityDiscovery,

    rCSSessionEstablishment                             [143] RCSSessionEstablishment,

    rCSSessionModification                              [144] RCSSessionModification,

<<<<<<< HEAD

    rCSSessionRelease                                   [145] RCSSessionRelease,

    rCSStartOfInterceptionWithAlreadyRegisteredUE       [146] RCSStartOfInterceptionWithAlreadyRegisteredUE



    -- AMF events, see clause 6.2.2.3, continued from tag 139

    aMFUEPolicyTransfer                                 [147] AMFUEPolicyTransfer

=======

    rCSSessionRelease                                   [145] RCSSessionRelease

>>>>>>> faffcd9 (Update 33128/r18/TS33128Payloads.asn)

    aMFUEPolicyTransfer                                 [146] AMFUEPolicyTransfer

}



IRITargetIdentifier ::= SEQUENCE
@@ -4276,6 +4266,16 @@ RCSCapabilityDiscovery ::= SEQUENCE 
    location                      [5] Location OPTIONAL

}



-- See clause 7.13.3.X for details of this structure

RCSStartOfInterceptionWithAlreadyRegisteredUE ::= SEQUENCE

{

    rCSTargetIdentities     [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    rCSRegistrationRequest  [2] IMSPayload,

    rCSRegistrationResponse [3] IMSPayload,

    location                [4] Location

}





-- ==============

-- RCS Parameters

-- ==============