From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
manifest/packageForLex copy.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/manifest/packageForLex copy.xml b/manifest/packageForLex copy.xml
index 25a1a2e..a1b1641 100644
--- a/manifest/packageForLex copy.xml
+++ b/manifest/packageForLex copy.xml
@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<Package xmlns="http://soap.sforce.com/2006/04/metadata">
<types>
+<<<<<<< HEAD:manifest/packageForLex copy.xml
<members>*</members>
+=======
+ <members>lexConsumableAccount</members>
+ <members>lexSummonsCreat</members>
+ <members>lexInventory</members>
+ <members>lexinventoryViewLWC</members>
+ <members>lexConsumable</members>
+>>>>>>> LEXCommunityLiJun:manifest/package.xml
<name>LightningComponentBundle</name>
</types>
<version>52.0</version>
--
Gitblit v1.9.1