Commit 8ef62738 authored by canterburym's avatar canterburym
Browse files

Resolve conflict

parents 294a33ce 26c945d0
Pipeline #12546 canceled with stages
in 18 seconds
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)}
-- Dummy change to test CI/CD, remove before merge
-- Dummy change to test CI/CD, remove before merge
......@@ -22,8 +22,8 @@ IMPORTS
-- Object Identifier Definition
-- ============================
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(15) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(15) cC(2)}
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version15(15) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version15(15) cC(2)}
-- both definitions relative to:
-- {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