Commit 1df88c41 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing merge conflict

parent d9f2bb46

103120/schema/xsd/ts_103120_TrafficPolicy.xsd

+0 −3
Original line number Diff line number Diff line
@@ -53,11 +53,8 @@ 
        <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">