Commit d9f2bb46 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing merge conflict

parents 7831030c 4009733a

103120/schema/json/ts_103120_TrafficPolicy.schema.json

+9 −0
Original line number Diff line number Diff line
@@ -193,6 +193,15 @@ 
        }

      },

      "required": []

    },

    "RCSPolicyCriteria": {

      "type": "object",

      "properties": {

        "tp:CommunicationServiceID": {

          "$ref": "ts_103280_2017_07#/$defs/ShortString"

        }

      },

      "required": []

    }

  }

}
 
 No newline at end of file

103120/schema/xsd/ts_103120_TrafficPolicy.xsd

+10 −1
Original line number Diff line number Diff line
@@ -53,7 +53,11 @@ 
        <xs:choice>

            <xs:element name="IPPolicyCriteria" type="IPPolicyCriteria"/>

            <xs:element name="MobileAccessPolicyCriteria" type="MobileAccessPolicyCriteria"/>

<<<<<<< HEAD

            <xs:element name="EthernetPolicyCriteria" type="EthernetPolicyCriteria"/>

=======

            <xs:element name="RCSPolicyCriteria" type="RCSPolicyCriteria"/>

>>>>>>> cr/103120/055

        </xs:choice>

    </xs:complexType>

    <xs:complexType name="IPPolicyCriteria">
@@ -90,4 +94,9 @@ 
            <xs:element name="VLANID" type="etsi:VLANID" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="RCSPolicyCriteria">

        <xs:sequence>

            <xs:element name="CommunicationServiceID" type="etsi:ShortString" minOccurs="1"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>