From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/fields/OwnerManager__c.field-meta.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/fields/OwnerManager__c.field-meta.xml b/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/fields/OwnerManager__c.field-meta.xml
index 9dbcf92..d60d77d 100644
--- a/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/fields/OwnerManager__c.field-meta.xml
+++ b/force-app/main/default/objects/GuaranteePeriodAlterationApplication__c/fields/OwnerManager__c.field-meta.xml
@@ -3,11 +3,10 @@
<fullName>OwnerManager__c</fullName>
<deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
- <label>鎵�鏈変汉缁忕悊</label>
+ <label>鎵�鏈変汉CL6 缁忕悊绾�</label>
<referenceTo>User</referenceTo>
<relationshipName>OwnerManager</relationshipName>
<required>false</required>
- <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
--
Gitblit v1.9.1