Commit a592dd57 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents b55f84a8 d9d28cb4

33128/r19/TS33128Payloads.asn

+0 −12
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ XIRIEvent ::= CHOICE 
    -- AMF events, see clause 6.2.2.2.14, continued from tag 147

    aMFUEContextUpdate                                  [175] AMFUEContextUpdate,



<<<<<<< HEAD

    -- SMF events, see clause 6.2.3.2 continued from tag 61

    sMFProSeRemoteUEReport                              [176] SMFProSeRemoteUEReport,

    sMFStartOfInterceptionWithConnectedProSeRemoteUE    [177] SMFStartOfInterceptionWithConnectedProSeRemoteUE,
@@ -324,11 +323,6 @@ XIRIEvent ::= CHOICE 


    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [185] StartOfInterceptionWithEstablishedIMSDataChannel

=======

    -- 5G ProSe Direct Communication events, see clause 7.X.2

    fiveGDDNMFProSeUNIDirectDiscovery                   [176] FiveGDDNMFProSeUNIDirectDiscovery,

    fiveGDDNMFProSeNNIDirectDiscovery                   [177] FiveGDDNMFProSeNNIDirectDiscovery

>>>>>>> cr/33128/0721

}



-- ==============
@@ -618,7 +612,6 @@ IRIEvent ::= CHOICE 
    -- AMF events, see clause 6.2.2.3, continued from tag 147

    aMFUEContextUpdate                                  [175] AMFUEContextUpdate,



<<<<<<< HEAD

    -- SMF events, see clause 6.2.3.7 continued from tag 61

    sMFProSeRemoteUEReport                              [176] SMFProSeRemoteUEReport,

    sMFStartOfInterceptionWithConnectedProSeRemoteUE    [177] SMFStartOfInterceptionWithConnectedProSeRemoteUE,
@@ -636,11 +629,6 @@ IRIEvent ::= CHOICE 


    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [185] StartOfInterceptionWithEstablishedIMSDataChannel

=======

    -- 5G ProSe Direct Communication events, see clause 7.X.3

    fiveGDDNMFProSeUNIDirectDiscovery                   [176] FiveGDDNMFProSeUNIDirectDiscovery,

    fiveGDDNMFProSeNNIDirectDiscovery                   [177] FiveGDDNMFProSeNNIDirectDiscovery

>>>>>>> cr/33128/0721

}



IRITargetIdentifier ::= SEQUENCE