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/Daily_Report__c/Daily_Report__c.object-meta.xml | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml b/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml
index 219e1a4..299b665 100644
--- a/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml
+++ b/force-app/main/default/objects/Daily_Report__c/Daily_Report__c.object-meta.xml
@@ -138,19 +138,13 @@
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <comment>Action override created by Lightning App Builder during activation.</comment>
- <content>test</content>
<formFactor>Large</formFactor>
- <skipRecordTypeSelect>false</skipRecordTypeSelect>
- <type>Flexipage</type>
+ <type>Default</type>
</actionOverrides>
<actionOverrides>
<actionName>View</actionName>
- <comment>Action override created by Lightning App Builder during activation.</comment>
- <content>test</content>
<formFactor>Small</formFactor>
- <skipRecordTypeSelect>false</skipRecordTypeSelect>
- <type>Flexipage</type>
+ <type>Default</type>
</actionOverrides>
<allowInChatterGroups>false</allowInChatterGroups>
<compactLayoutAssignment>SYSTEM</compactLayoutAssignment>
--
Gitblit v1.9.1