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/Event__c/Event__c.object-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Event__c/Event__c.object-meta.xml b/force-app/main/default/objects/Event__c/Event__c.object-meta.xml
index 169ee6a..aca8e01 100644
--- a/force-app/main/default/objects/Event__c/Event__c.object-meta.xml
+++ b/force-app/main/default/objects/Event__c/Event__c.object-meta.xml
@@ -174,8 +174,8 @@
         <customTabListAdditionalFields>StartDateTime__c</customTabListAdditionalFields>
         <customTabListAdditionalFields>EndDateTime__c</customTabListAdditionalFields>
         <customTabListAdditionalFields>Reporter_Name__c</customTabListAdditionalFields>
-        <excludedStandardButtons>New</excludedStandardButtons>
         <excludedStandardButtons>Accept</excludedStandardButtons>
+        <excludedStandardButtons>New</excludedStandardButtons>
         <excludedStandardButtons>ChangeOwner</excludedStandardButtons>
         <listViewButtons>Minister</listViewButtons>
         <searchResultsAdditionalFields>Activity_Type2__c</searchResultsAdditionalFields>

--
Gitblit v1.9.1