fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.html

@@ -155,6 +155,7 @@
                                    onfirst={handleFirst}
                                    onlast={handleLast}
                                    page-size-options={pageSizeOptions}
                                    default-page-size={pageSize}
                                    previous-button-disabled={previousButtonDisabled}
                                    next-button-disabled={nextButtonDisabled}
                                    record-start={recordStart}
@@ -558,4 +559,4 @@
            </div>
        </div>
    </template>
</template>
</template>