From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
index b528937..32c203b 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
@@ -28,7 +28,11 @@
.THIS .no_data_area {
text-align: center;
+<<<<<<< HEAD
+ margin: 0.5em 0;
+=======
margin: .5em 0;
+>>>>>>> LEXCommunityLiJun
}
.THIS.report_list_area {
@@ -153,7 +157,11 @@
}
.THIS .customRequired:before {
+<<<<<<< HEAD
+ content: '*';
+=======
content: "*";
+>>>>>>> LEXCommunityLiJun
margin: 0 0.125rem 0 0.125rem;
color: rgb(194, 57, 52);
float: left;
@@ -199,4 +207,8 @@
.THIS td {
white-space: normal;
overflow-wrap: break-word;
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1