Commit 8ef62738 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Resolve conflict

parents 294a33ce 26c945d0

102232-1/LI-PS-PDU.asn

+0 −4
Changes for 102232-1/LI-PS-PDU.asn: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line 
LI-PS-PDU

{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



DEFINITIONS IMPLICIT TAGS ::=



BEGIN

102232-5/IPMultimediaPDU.asn

+2 −2
Changes for 102232-5/IPMultimediaPDU.asn: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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)}