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/packageForSign.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/manifest/packageForSign.xml b/manifest/packageForSign.xml
index d9db94a..c0c2ef3 100644
--- a/manifest/packageForSign.xml
+++ b/manifest/packageForSign.xml
@@ -3,8 +3,14 @@
<types>
<members>updateESignBatch</members>
<members>DNUpsertBatch</members>
- <members>OCMManagementProvinceBatch</members>
+ <members>OCSMHandler</members>
+ <members>updateESignBatchTest</members>
+ <members>OCSMHandlerTest</members>
+ <members>DNUpsertBatchTest</members>
+ <members>SyncProvinceWIndowToSignForm</members>
+ <members>SyncProvinceWIndowToSignFormTest</members>
+ <members>LexArriveGoodsController</members>
<name>ApexClass</name>
- </types>
+ </types>
<version>52.0</version>
</Package>
--
Gitblit v1.9.1