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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/manifest/LEXC02packagelexcommunityupdate.xml b/manifest/LEXC02packagelexcommunityupdate.xml
index 5943319..7a2b7d9 100644
--- a/manifest/LEXC02packagelexcommunityupdate.xml
+++ b/manifest/LEXC02packagelexcommunityupdate.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
- <fullName>DeployToProducton_Update</fullName>
+ <fullName>03_LEXCommunity_Update1%2E0</fullName>
<types>
<members>ArriveGoodsController</members>
<members>ArriveGoodsControllerTest</members>
@@ -20,9 +20,19 @@
<members>ConsumableOrderDetail2Trigger</members>
<name>ApexTrigger</name>
</types>
- <types>
- <members>Dealer_enquiryJs1</members>
- <name>StaticResource</name>
- </types>
+ <types>
+ <members>CreateTarget</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>
<version>50.0</version>
</Package>
--
Gitblit v1.9.1