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/pages/AdvanceOpportunity.page-meta.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/pages/AdvanceOpportunity.page-meta.xml b/force-app/main/default/pages/AdvanceOpportunity.page-meta.xml
index c9b24a8..04f7b4e 100644
--- a/force-app/main/default/pages/AdvanceOpportunity.page-meta.xml
+++ b/force-app/main/default/pages/AdvanceOpportunity.page-meta.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>41.0</apiVersion>
+    <availableInTouch>false</availableInTouch>
+    <confirmationTokenRequired>false</confirmationTokenRequired>
     <label>AdvanceOpportunity</label>
-</ApexPage>
\ No newline at end of file
+</ApexPage>

--
Gitblit v1.9.1