Skip to content
GitLab
Commit a5eac2be authored by canterburym's avatar canterburym
Browse files

Correcting previous push

parent 8b228118
Pipeline #11382 passed with stage
in 20 seconds
Hide whitespace changes
Inline Side-by-side
102232-5/IPMultimediaPDU.asn
View file @ a5eac2be
...@@ -22,13 +22,8 @@ IMPORTS ...@@ -22,13 +22,8 @@ IMPORTS
-- Object Identifier Definition -- 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)} iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)} iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)}
>>>>>>> rap/102232-5
-- both definitions relative to: -- both definitions relative to:
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment