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/aura/NewAgencyOpportunity/NewAgencyOpportunity.css | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
index c51f858..85e3804 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
@@ -65,8 +65,6 @@
.THIS .slds-spinner_container {
position: revert;
}
-<<<<<<< HEAD
-=======
.THIS .slds-backdrop2 {
position: fixed;
@@ -79,4 +77,3 @@
.THIS .slds-backdrop_open2 {
z-index: 9003; /* 閬僵灞傜殑灞傜骇锛岄渶瑕佺‘淇濇瘮妯℃�佹鐨勫眰绾ч珮 */
}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1