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/lexArriveGoodsMain/lexArriveGoodsMain.html | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
index cb3380b..d8c0cbc 100644
--- a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
+++ b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
@@ -238,8 +238,4 @@
</section>
<div class="slds-backdrop slds-backdrop_open"></div>
</template>
-<<<<<<< HEAD
</template>
-=======
-</template>
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1