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/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json b/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json
index 3fbfdc5..1c72251 100644
--- a/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json
+++ b/force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json
@@ -1,15 +1,17 @@
{
- "componentVariants" : [ {
- "id" : "5a61b685-6f3e-4b96-979f-4aa7aa2ecc1f",
- "propertyOverrides" : {
- "componentAttributes" : {
- "NavigationMenuEditorRefresh" : "ENGUser"
- }
- },
- "targetId" : "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
- "type" : "componentVariant"
- } ],
- "developerName" : "Default_CustomComponent_Properties_Component_Properties",
- "id" : "5cd60da6-8927-4324-9ed5-e03ab9ab5da6",
- "type" : "experienceVariation"
-}
\ No newline at end of file
+ "componentVariants": [
+ {
+ "id": "5a61b685-6f3e-4b96-979f-4aa7aa2ecc1f",
+ "propertyOverrides": {
+ "componentAttributes": {
+ "NavigationMenuEditorRefresh": "ENGUser"
+ }
+ },
+ "targetId": "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
+ "type": "componentVariant"
+ }
+ ],
+ "developerName": "Default_CustomComponent_Properties_Component_Properties",
+ "id": "5cd60da6-8927-4324-9ed5-e03ab9ab5da6",
+ "type": "experienceVariation"
+}
--
Gitblit v1.9.1