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/Fixture_Set_Detail__c/fields/Fixture_Set__c.field-meta.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Fixture_Set__c.field-meta.xml b/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Fixture_Set__c.field-meta.xml
index 5b2bab0..3b570d4 100644
--- a/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Fixture_Set__c.field-meta.xml
+++ b/force-app/main/default/objects/Fixture_Set_Detail__c/fields/Fixture_Set__c.field-meta.xml
@@ -8,6 +8,7 @@
<relationshipName>Fixture_Set_Detail</relationshipName>
<relationshipOrder>0</relationshipOrder>
<reparentableMasterDetail>false</reparentableMasterDetail>
+ <trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>MasterDetail</type>
<writeRequiresMasterRead>false</writeRequiresMasterRead>
--
Gitblit v1.9.1