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

diff --git a/force-app/main/default/reports/ConsumableSalesReport/LastMonthSalesByProduct.report-meta.xml b/force-app/main/default/reports/ConsumableSalesReport/LastMonthSalesByProduct.report-meta.xml
index 948e2de..9876a83 100644
--- a/force-app/main/default/reports/ConsumableSalesReport/LastMonthSalesByProduct.report-meta.xml
+++ b/force-app/main/default/reports/ConsumableSalesReport/LastMonthSalesByProduct.report-meta.xml
@@ -13,7 +13,7 @@
         <enableHoverLabels>false</enableHoverLabels>
         <expandOthers>true</expandOthers>
         <groupingColumn
-    >Consumable_Orderdetails__c.Product_bbname__c</groupingColumn>
+        >Consumable_Orderdetails__c.Product_bbname__c</groupingColumn>
         <location>CHART_BOTTOM</location>
         <showAxisLabels>false</showAxisLabels>
         <showPercentage>false</showPercentage>

--
Gitblit v1.9.1