From df5aa8087c2c7328dc4188f05d762c8df1f0b07a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 18 七月 2023 09:19:12 +0800
Subject: [PATCH] changeorg
---
force-app/main/default/lwc/lexConsumable/lexConsumable.html | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.html b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
index e8dbd38..bbf9a83 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.html
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
@@ -681,10 +681,7 @@
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}
@@ -711,10 +708,7 @@
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}
@@ -1105,8 +1099,4 @@
<div class="slds-backdrop slds-backdrop_open"></div>
</template>
</template>
-<<<<<<< HEAD
</template>
-=======
-</template>
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1