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/lexSaleAndDelivery/lexSaleAndDelivery.js |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
index f33bb52..80abe62 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
@@ -438,8 +438,4 @@
     openModal() {
         this.isModalOpen = true;
     }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1