Commit 6bb1fe6c authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Resolving merge conflicy in TS103280 CR027

parents 3170dd78 d43cdba0

103280/TS_103_280.asn1

+2 −0
Original line number Original line Diff line number Diff line
@@ -95,4 +95,6 @@ IPProtocol ::= INTEGER (0..255) 




VLANID ::= INTEGER (0..4095)

VLANID ::= INTEGER (0..4095)





ServiceAccessIdentifier ::= UTF8String



END
 
END

103280/TS_103_280.schema.json

+3 −0
Original line number Original line Diff line number Diff line
@@ -393,6 +393,9 @@ 
        "etsi280:latitude",

        "etsi280:latitude",

        "etsi280:longitude"

        "etsi280:longitude"

      ]

      ]

    },

    "ServiceAccessIdentifier": {

      "type": "string"

    }

    }

  }

  }

}
 
}

103280/TS_103_280.xsd

+3 −0
Original line number Original line Diff line number Diff line
@@ -283,4 +283,7 @@ 
            <xs:pattern value="[A-HJ-NPR-Z0-9]{17}"/>

            <xs:pattern value="[A-HJ-NPR-Z0-9]{17}"/>

        </xs:restriction>

        </xs:restriction>

    </xs:simpleType>

    </xs:simpleType>

     <xs:simpleType name="ServiceAccessIdentifier"> 

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

 </xs:simpleType>

</xs:schema>
 
</xs:schema>