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/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
index 32c203b..920fa09 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
@@ -28,11 +28,7 @@
.THIS .no_data_area {
text-align: center;
-<<<<<<< HEAD
margin: 0.5em 0;
-=======
- margin: .5em 0;
->>>>>>> LEXCommunityLiJun
}
.THIS.report_list_area {
@@ -157,11 +153,7 @@
}
.THIS .customRequired:before {
-<<<<<<< HEAD
content: '*';
-=======
- content: "*";
->>>>>>> LEXCommunityLiJun
margin: 0 0.125rem 0 0.125rem;
color: rgb(194, 57, 52);
float: left;
@@ -207,8 +199,4 @@
.THIS td {
white-space: normal;
overflow-wrap: break-word;
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1