fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

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

@@ -681,6 +681,10 @@
                                onfirst={goFirstPage}
                                onlast={goLastPage}
                                page-size-options={pageSizeOptions}
<<<<<<< HEAD
=======
                                default-page-size={pageSize}
>>>>>>> LEXCommunityLiJun
                                previous-button-disabled={previousButtonDisabled}
                                next-button-disabled={nextButtonDisabled}
                                record-start={recordStart}
@@ -707,6 +711,10 @@
                                onfirst={goFirstPage}
                                onlast={goLastPage}
                                page-size-options={pageSizeOptions}
<<<<<<< HEAD
=======
                                default-page-size={pageSize}
>>>>>>> LEXCommunityLiJun
                                previous-button-disabled={previousButtonDisabled}
                                next-button-disabled={nextButtonDisabled}
                                record-start={recordStart}
@@ -1097,4 +1105,8 @@
            <div class="slds-backdrop slds-backdrop_open"></div>
        </template>
    </template>
<<<<<<< HEAD
</template>
=======
</template>
>>>>>>> LEXCommunityLiJun