From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
index 4b07073..2034d60 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
@@ -267,11 +267,7 @@
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>
@@ -283,10 +279,7 @@
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}
@@ -297,8 +290,4 @@
</div>
</div>
</div>
-<<<<<<< HEAD
</template>
-=======
-</template>
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1