From 4488f711dbc01a8db6753907cae2ef4021dede68 Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期三, 13 十二月 2023 16:30:27 +0800
Subject: [PATCH] 修改前备份

---
 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