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/StraightBackAddress.page-meta.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/StraightBackAddress.page-meta.xml b/force-app/main/default/pages/StraightBackAddress.page-meta.xml
index 5dc8817..75ff233 100644
--- a/force-app/main/default/pages/StraightBackAddress.page-meta.xml
+++ b/force-app/main/default/pages/StraightBackAddress.page-meta.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>45.0</apiVersion>
- <availableInTouch>true</availableInTouch>
+ <availableInTouch>false</availableInTouch>
<confirmationTokenRequired>false</confirmationTokenRequired>
<label>StraightBackAddress</label>
</ApexPage>
--
Gitblit v1.9.1