fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/objects/TransferApplyDetail__c/fields/SalesProvince__c.field-meta.xml

@@ -285,12 +285,6 @@
                <default>false</default>
                <label>MA共通</label>
            </value>
            <value>
                <fullName>ET共通</fullName>
                <default>false</default>
                <isActive>false</isActive>
                <label>ET共通</label>
            </value>
        </valueSetDefinition>
    </valueSet>
</CustomField>