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/lwc/otherButtonInOpportunity/otherButtonInOpportunity.js-meta.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/force-app/main/default/lwc/otherButtonInOpportunity/otherButtonInOpportunity.js-meta.xml b/force-app/main/default/lwc/otherButtonInOpportunity/otherButtonInOpportunity.js-meta.xml
index ea41701..2b7649d 100644
--- a/force-app/main/default/lwc/otherButtonInOpportunity/otherButtonInOpportunity.js-meta.xml
+++ b/force-app/main/default/lwc/otherButtonInOpportunity/otherButtonInOpportunity.js-meta.xml
@@ -6,5 +6,6 @@
 		<target>lightning__RecordPage</target>
 		<target>lightning__AppPage</target>
 		<target>lightning__HomePage</target>
+		<target>lightning__RecordAction</target>
 	</targets>
 </LightningComponentBundle>
\ No newline at end of file

--
Gitblit v1.9.1