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/createRecord.json |   70 +++++++++++++++++-----------------
 1 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/force-app/main/default/experiences/Site3/views/createRecord.json b/force-app/main/default/experiences/Site3/views/createRecord.json
index b69c06a..5db9647 100644
--- a/force-app/main/default/experiences/Site3/views/createRecord.json
+++ b/force-app/main/default/experiences/Site3/views/createRecord.json
@@ -1,39 +1,39 @@
 {
-  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
-  "componentName": "siteforce:sldsOneColLayout",
-  "dataProviders": [],
-  "id": "9cb0795b-6c6d-4948-9dcd-68a568028499",
-  "label": "Create Record",
-  "regions": [
-    {
-      "id": "d451ff76-e162-4234-bfff-bc56db891edd",
-      "regionName": "header",
-      "type": "region"
-    },
-    {
-      "components": [
+    "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+    "componentName": "siteforce:sldsOneColLayout",
+    "dataProviders": [],
+    "id": "9cb0795b-6c6d-4948-9dcd-68a568028499",
+    "label": "Create Record",
+    "regions": [
         {
-          "componentAttributes": {
-            "actionApiName": "{!actionApiName}"
-          },
-          "componentName": "forceCommunity:createRecordForm",
-          "id": "b561a15a-51cf-485f-b7f6-3218203e6325",
-          "renderPriority": "NEUTRAL",
-          "renditionMap": {},
-          "type": "component"
+            "id": "d451ff76-e162-4234-bfff-bc56db891edd",
+            "regionName": "header",
+            "type": "region"
+        },
+        {
+            "components": [
+                {
+                    "componentAttributes": {
+                        "actionApiName": "{!actionApiName}"
+                    },
+                    "componentName": "forceCommunity:createRecordForm",
+                    "id": "b561a15a-51cf-485f-b7f6-3218203e6325",
+                    "renderPriority": "NEUTRAL",
+                    "renditionMap": {},
+                    "type": "component"
+                }
+            ],
+            "id": "4f97e4bd-c420-46f2-80c4-4aefec37a12b",
+            "regionName": "content",
+            "type": "region"
+        },
+        {
+            "id": "5a882757-dc4e-4c73-9191-6d0edb0dcb95",
+            "regionName": "footer",
+            "type": "region"
         }
-      ],
-      "id": "4f97e4bd-c420-46f2-80c4-4aefec37a12b",
-      "regionName": "content",
-      "type": "region"
-    },
-    {
-      "id": "5a882757-dc4e-4c73-9191-6d0edb0dcb95",
-      "regionName": "footer",
-      "type": "region"
-    }
-  ],
-  "themeLayoutType": "Inner",
-  "type": "view",
-  "viewType": "createrecord"
+    ],
+    "themeLayoutType": "Inner",
+    "type": "view",
+    "viewType": "createrecord"
 }

--
Gitblit v1.9.1