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/LEXC02packagelexcommunityupdate.xml | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/manifest/LEXC02packagelexcommunityupdate.xml b/manifest/LEXC02packagelexcommunityupdate.xml
index 39b7ddd..7a2b7d9 100644
--- a/manifest/LEXC02packagelexcommunityupdate.xml
+++ b/manifest/LEXC02packagelexcommunityupdate.xml
@@ -1,10 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+ <fullName>03_LEXCommunity_Update1%2E0</fullName>
<types>
<members>ArriveGoodsController</members>
<members>ArriveGoodsControllerTest</members>
- <members>LexArriveGoodsController</members>
+ <members>ArriveGoodsControllerTestV2</members>
<members>DealerInquiryModifyStateController</members>
+ <members>DealerInquiryModifyStateControllerTest</members>
+ <members>LexArriveGoodsController</members>
+ <members>LexArriveGoodsControllerTest</members>
+ <members>LexArriveGoodsControllerTest1</members>
<name>ApexClass</name>
</types>
<types>
@@ -12,23 +17,22 @@
<name>ApexPage</name>
</types>
<types>
+ <members>ConsumableOrderDetail2Trigger</members>
+ <name>ApexTrigger</name>
+ </types>
+ <types>
<members>CreateTarget</members>
- <members>WeeklyReport</members>
<members>RetrospectiveWeeklyReport</members>
+ <members>WeeklyReport</members>
+ <members>AgencyAccount</members>
+ <members>DealerPersonnelInformationImport</members>
+ <members>NewAgencyContact2</members>
+ <members>NewAgencyOpportunity</members>
<name>AuraDefinitionBundle</name>
</types>
<types>
<members>lexArriveGoods</members>
<name>LightningComponentBundle</name>
</types>
- <types>
- <members>ConsumableOrderDetail2Trigger</members>
- <members>ArriveGoodsController</members>
- <name>ApexTrigger</name>
- </types>
- <types>
- <members>Community_LEX_PS</members>
- <name>PermissionSet</name>
- </types>
- <version>57.0</version>
-</Package>
\ No newline at end of file
+ <version>50.0</version>
+</Package>
--
Gitblit v1.9.1