Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LI - Lawful Interception
Trial
Commits
8b228118
Commit
8b228118
authored
May 09, 2022
by
canterburym
Browse files
Updated -5 OID
parents
2dd292c9
6b3f32c8
Pipeline
#11381
failed with stage
in 19 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
102232-5/IPMultimediaPDU.asn
View file @
8b228118
...
@@ -22,8 +22,13 @@ IMPORTS
...
@@ -22,8 +22,13 @@ IMPORTS
-- Object Identifier Definition
-- Object Identifier Definition
-- ============================
-- ============================
<<<<<<< HEAD
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) iRI(1)}
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) cC(2)}
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:
-- 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)}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment