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_OneToOne_Link__c/fields/Main_Asset_Status__c.field-meta.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Fixture_OneToOne_Link__c/fields/Main_Asset_Status__c.field-meta.xml b/force-app/main/default/objects/Fixture_OneToOne_Link__c/fields/Main_Asset_Status__c.field-meta.xml
index 16969d9..04711e9 100644
--- a/force-app/main/default/objects/Fixture_OneToOne_Link__c/fields/Main_Asset_Status__c.field-meta.xml
+++ b/force-app/main/default/objects/Fixture_OneToOne_Link__c/fields/Main_Asset_Status__c.field-meta.xml
@@ -6,7 +6,6 @@
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
     <label>涓讳綋澶囧搧鐘舵��</label>
     <required>false</required>
-    <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>
     <type>Text</type>
     <unique>false</unique>

--
Gitblit v1.9.1