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/Activity_History_Daily_Report__c/fields/Contact__c.field-meta.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/Activity_History_Daily_Report__c/fields/Contact__c.field-meta.xml b/force-app/main/default/objects/Activity_History_Daily_Report__c/fields/Contact__c.field-meta.xml
index 6e9f575..7db2bab 100644
--- a/force-app/main/default/objects/Activity_History_Daily_Report__c/fields/Contact__c.field-meta.xml
+++ b/force-app/main/default/objects/Activity_History_Daily_Report__c/fields/Contact__c.field-meta.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Contact__c</fullName>
- <deleteConstraint>Restrict</deleteConstraint>
+ <deleteConstraint>SetNull</deleteConstraint>
<externalId>false</externalId>
<label>鎷呭綋鑰�</label>
<referenceTo>Contact</referenceTo>
+ <relationshipLabel>娲诲姩1</relationshipLabel>
<relationshipName>Activity_History_Contact</relationshipName>
- <required>true</required>
+ <required>false</required>
<trackTrending>false</trackTrending>
<type>Lookup</type>
</CustomField>
--
Gitblit v1.9.1