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/reports/ConsumableSalesReport/WeeklyReportForAgency.report-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/reports/ConsumableSalesReport/WeeklyReportForAgency.report-meta.xml b/force-app/main/default/reports/ConsumableSalesReport/WeeklyReportForAgency.report-meta.xml
index 6a2c76e..c566588 100644
--- a/force-app/main/default/reports/ConsumableSalesReport/WeeklyReportForAgency.report-meta.xml
+++ b/force-app/main/default/reports/ConsumableSalesReport/WeeklyReportForAgency.report-meta.xml
@@ -30,7 +30,7 @@
         <value>1</value>
     </params>
     <reportType
-  >CustomEntityCustomEntity$Agency_Report_Header__c$Agency_Report__c</reportType>
+    >CustomEntityCustomEntity$Agency_Report_Header__c$Agency_Report__c</reportType>
     <scope>organization</scope>
     <showDetails>true</showDetails>
     <showGrandTotal>true</showGrandTotal>

--
Gitblit v1.9.1