From 4488f711dbc01a8db6753907cae2ef4021dede68 Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期三, 13 十二月 2023 16:30:27 +0800
Subject: [PATCH] 修改前备份

---
 force-app/main/default/lwc/lexTopPage/lexTopPage.html |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/lwc/lexTopPage/lexTopPage.html b/force-app/main/default/lwc/lexTopPage/lexTopPage.html
index 240670e..fbd71f0 100644
--- a/force-app/main/default/lwc/lexTopPage/lexTopPage.html
+++ b/force-app/main/default/lwc/lexTopPage/lexTopPage.html
@@ -308,8 +308,4 @@
             <div class="slds-backdrop slds-backdrop_open"></div>
         </template>
     </template>
-<<<<<<< HEAD
 </template>
-=======
-</template>
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1