Loading 102232-5/IPMultimediaPDU.asn +5 −0 Original line number Diff line number Diff line Loading @@ -22,8 +22,13 @@ IMPORTS -- Object Identifier Definition -- ============================ <<<<<<< HEAD iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) iRI(1)} iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) cC(2)} ======= iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)} iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)} >>>>>>> rap/102232-5 -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} Loading Loading
102232-5/IPMultimediaPDU.asn +5 −0 Original line number Diff line number Diff line Loading @@ -22,8 +22,13 @@ IMPORTS -- Object Identifier Definition -- ============================ <<<<<<< HEAD iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) iRI(1)} iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) cC(2)} ======= iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)} iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)} >>>>>>> rap/102232-5 -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} Loading