Commit 0ee7dc5b authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing merge conflict in TS103280 CR030 !156

parents 5df4eeb9 9ce2de13

103280/TS_103_280.schema.json

+7 −1
Original line number Diff line number Diff line
@@ -208,6 +208,12 @@ 
      "type": "string",

      "pattern": "^[0-9]{32}$"

    },

    "APN": {

      "$ref": "#/$defs/LongString"

    },

    "DNN": {

      "$ref": "#/$defs/LongString"

    },

    "IPAddress": {

      "oneOf": [

        {

103280/TS_103_280.xsd

+8 −0
Original line number Diff line number Diff line
@@ -286,9 +286,17 @@ 
    <xs:simpleType name="ServiceAccessIdentifier">

        <xs:restriction base="xs:string"/>

    </xs:simpleType>

<<<<<<< HEAD

    <xs:simpleType name="EUICCID">

        <xs:restriction base="xs:token">

            <xs:pattern value="[0-9]{32}"/>

        </xs:restriction>

=======

    <xs:simpleType name="APN">

        <xs:restriction base="LongString"/>

    </xs:simpleType>

    <xs:simpleType name="DNN">

        <xs:restriction base="LongString"/>

>>>>>>> cr/103280/030

    </xs:simpleType>

</xs:schema>