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/Consumable_21/views/messages.json | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/views/messages.json b/force-app/main/default/experiences/Consumable_21/views/messages.json
index 9ca4c7e..5009b36 100644
--- a/force-app/main/default/experiences/Consumable_21/views/messages.json
+++ b/force-app/main/default/experiences/Consumable_21/views/messages.json
@@ -1,27 +1,27 @@
{
- "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "123209be-ec9f-4805-8350-748a0596aa39",
- "label": "Messages",
- "regions": [
- {
- "components": [
+ "appPageId": "928a593f-f341-403e-8346-df32afe29b52",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "123209be-ec9f-4805-8350-748a0596aa39",
+ "label": "Messages",
+ "regions": [
{
- "componentAttributes": {},
- "componentName": "forceChatter:messages",
- "id": "856e32c5-bf3e-448d-95b2-dd31f6699c88",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "forceChatter:messages",
+ "id": "856e32c5-bf3e-448d-95b2-dd31f6699c88",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "e1c5a01f-e01b-4d10-9e51-754ac54c621b",
+ "regionName": "content",
+ "type": "region"
}
- ],
- "id": "e1c5a01f-e01b-4d10-9e51-754ac54c621b",
- "regionName": "content",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "messages"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "messages"
}
--
Gitblit v1.9.1