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/views/奥林巴斯电子签收系统.json | 100 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 50 deletions(-)
diff --git "a/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
index c788032..ab830cd 100644
--- "a/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -1,55 +1,55 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "224c5f58-859e-49e8-9564-18d11e2ddf47",
- "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
- "regions": [
- {
- "id": "518d33a9-c0b3-4d07-bc99-314ad3b41419",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "224c5f58-859e-49e8-9564-18d11e2ddf47",
+ "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
+ "regions": [
{
- "componentAttributes": {},
- "componentName": "c:eSignHomePage",
- "id": "ea68fcac-c35d-415e-86e8-040f4a6820d5",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "6ff94da4-7138-452e-a15c-ddfbb167b364",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "c7a5b214-989d-437e-b11b-19c533e37cf3",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "id": "518d33a9-c0b3-4d07-bc99-314ad3b41419",
+ "regionName": "header",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "528b9108-2ebf-4ba1-8e2b-9ebec00fa61a",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:eSignHomePage",
+ "id": "ea68fcac-c35d-415e-86e8-040f4a6820d5",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "6ff94da4-7138-452e-a15c-ddfbb167b364",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "c7a5b214-989d-437e-b11b-19c533e37cf3",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "528b9108-2ebf-4ba1-8e2b-9ebec00fa61a",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "d2699d17-8cc3-4386-a7db-72e53dea52e4",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "d2699d17-8cc3-4386-a7db-72e53dea52e4",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-esign-data-entry"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-esign-data-entry"
}
--
Gitblit v1.9.1