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

diff --git a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
index 2754039..60c6cad 100644
--- a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
+++ b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
@@ -1377,8 +1377,4 @@
             </div>
         </div>
     </template>
-<<<<<<< HEAD
 </template>
-=======
-</template>
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1