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/ASEActivity__c.object-meta.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml b/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml
index 3ad2efc..8aaea98 100644
--- a/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml
+++ b/force-app/main/default/objects/ASEActivity__c/ASEActivity__c.object-meta.xml
@@ -58,7 +58,9 @@
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
- <type>Default</type>
+ <content>NewAndEditASEActivity</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>Edit</actionName>
@@ -86,7 +88,9 @@
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
- <type>Default</type>
+ <content>NewAndEditASEActivity</content>
+ <skipRecordTypeSelect>false</skipRecordTypeSelect>
+ <type>Visualforce</type>
</actionOverrides>
<actionOverrides>
<actionName>New</actionName>
--
Gitblit v1.9.1