fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/Consumable_order__c/fieldSets/arrive_view.fieldSet-meta.xml

@@ -38,17 +38,12 @@
        <isRequired>false</isRequired>
    </displayedFields>
    <displayedFields>
        <field>Order_date__c</field>
        <field>Shipment_date__c</field>
        <isFieldManaged>false</isFieldManaged>
        <isRequired>false</isRequired>
    </displayedFields>
    <displayedFields>
        <field>First_Delivery__c</field>
        <isFieldManaged>false</isFieldManaged>
        <isRequired>false</isRequired>
    </displayedFields>
    <displayedFields>
        <field>Shipment_date__c</field>
        <isFieldManaged>false</isFieldManaged>
        <isRequired>false</isRequired>
    </displayedFields>