Commit 38388f07 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing merge conflict

parents fa292c32 c2eae624

103120/schema/xsd/ts_103120_Task.xsd

+13 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 
                    <xs:element name="Flags" type="LDTaskFlags" minOccurs="0"/>

                    <xs:element name="AlternativePreservationReferences" type="ListOfAlternativePreservationReferences" minOccurs="0"/>

                    <xs:element name="NationalLDTaskingParameters" type="NationalLDTaskingParameters" minOccurs="0"/>

                    <xs:element name="Deadlines" type="ListOfLDDeadlines" minOccurs="0"/>

                    <xs:element name="ManualInformation" type="etsi:LongString" minOccurs="0"/>

                </xs:sequence>

            </xs:extension>
@@ -233,4 +234,16 @@ 
            <xs:element name="ObjectIdentifier" type="core:ObjectIdentifier" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ListOfLDDeadlines">

        <xs:sequence>

            <xs:element name="LDDeadline" type="LDDeadline" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="LDDeadline">

        <xs:sequence>

            <xs:element name="DateTime" type="etsi:QualifiedDateTime" minOccurs="0"/>

            <xs:element name="NatureOfDeadline" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="OtherInformation" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>