From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
manifest/LEXC03report.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/manifest/LEXC03report.xml b/manifest/LEXC03report.xml
index c0d3f04..2be306e 100644
--- a/manifest/LEXC03report.xml
+++ b/manifest/LEXC03report.xml
@@ -2,15 +2,15 @@
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
<types>
<members
- >Consumable Sales Report/Consumable_Outstock_Invoice_Lex</members>
+ >Consumable Sales Report/Consumable_Outstock_Invoice_Lex</members>
<members>Consumable Sales Report/Report_Outbound_Lex</members>
<members
- >Consumable Sales Report/CurrentMonthSalesRankByProduct</members>
+ >Consumable Sales Report/CurrentMonthSalesRankByProduct</members>
<members>Consumable Sales Report/WeeklyReportForAgency</members>
<members>Consumable Sales Report/LastMonthSalesByProduct</members>
<members>Consumable Sales Report/LastMonthSalesByAccount1</members>
<members
- >Consumable Sales Report/CurrentMonthSalesRankByAccount</members>
+ >Consumable Sales Report/CurrentMonthSalesRankByAccount</members>
<members>ConsumableSalesReport</members>
<name>Report</name>
</types>
--
Gitblit v1.9.1