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/experiences/Site3/config/mainAppPage.json | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/config/mainAppPage.json b/force-app/main/default/experiences/Site3/config/mainAppPage.json
index 0349243..eaa8a8f 100644
--- a/force-app/main/default/experiences/Site3/config/mainAppPage.json
+++ b/force-app/main/default/experiences/Site3/config/mainAppPage.json
@@ -1,10 +1,10 @@
{
- "cmsSettings": {},
- "currentThemeId": "64870c02-e4cf-4464-8930-7aed413f325b",
- "headMarkup": null,
- "id": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "isRelaxedCSPLevel": false,
- "label": "main",
- "templateName": "Starter Template",
- "type": "appPage"
+ "cmsSettings": {},
+ "currentThemeId": "64870c02-e4cf-4464-8930-7aed413f325b",
+ "headMarkup": null,
+ "id": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "isRelaxedCSPLevel": false,
+ "label": "main",
+ "templateName": "Starter Template",
+ "type": "appPage"
}
--
Gitblit v1.9.1