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

diff --git a/force-app/main/default/objects/ASEActivity__c/fields/Activity_Purpose__c.field-meta.xml b/force-app/main/default/objects/ASEActivity__c/fields/Activity_Purpose__c.field-meta.xml
index 3f57680..3ea218f 100644
--- a/force-app/main/default/objects/ASEActivity__c/fields/Activity_Purpose__c.field-meta.xml
+++ b/force-app/main/default/objects/ASEActivity__c/fields/Activity_Purpose__c.field-meta.xml
@@ -8,7 +8,6 @@
     <trackTrending>false</trackTrending>
     <type>Picklist</type>
     <valueSet>
-        <restricted>true</restricted>
         <valueSetDefinition>
             <sorted>false</sorted>
             <value>

--
Gitblit v1.9.1