fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

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

@@ -267,7 +267,11 @@
                            sorted-by={sortedBy}
                            onsort={onHandleSort}
                            hide-checkbox-column={hidecheckboxcolumn}
<<<<<<< HEAD
                            style="word-wrap: break-word; word-break: break-all"
=======
                            style="word-wrap:break-word; word-break:break-all;"
>>>>>>> LEXCommunityLiJun
                            class="wrapped-header-datatable"
                        >
                        </c-lex-custom-lightning-datatable>
@@ -279,7 +283,10 @@
                        onfirst={handleFirst}
                        onlast={handleLast}
                        page-size-options={pageSizeOptions}
<<<<<<< HEAD
=======
                        default-page-size={pageSize}
>>>>>>> LEXCommunityLiJun
                        previous-button-disabled={previousButtonDisabled}
                        next-button-disabled={nextButtonDisabled}
                        record-start={recordStart}
@@ -290,4 +297,8 @@
            </div>
        </div>
    </div>
</template>
<<<<<<< HEAD
</template>
=======
</template>
>>>>>>> LEXCommunityLiJun