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/variations/defaultNavigationMenuComponentProperties.json | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable_21/variations/defaultNavigationMenuComponentProperties.json b/force-app/main/default/experiences/Consumable_21/variations/defaultNavigationMenuComponentProperties.json
index 26c2d7d..05aecd6 100644
--- a/force-app/main/default/experiences/Consumable_21/variations/defaultNavigationMenuComponentProperties.json
+++ b/force-app/main/default/experiences/Consumable_21/variations/defaultNavigationMenuComponentProperties.json
@@ -1,17 +1,17 @@
{
- "componentVariants": [
- {
- "id": "513f46c4-6c7a-4bad-bc61-bd8ca0e820c4",
- "propertyOverrides": {
- "componentAttributes": {
- "NavigationMenuEditorRefresh": "ENGUser1"
+ "componentVariants": [
+ {
+ "id": "513f46c4-6c7a-4bad-bc61-bd8ca0e820c4",
+ "propertyOverrides": {
+ "componentAttributes": {
+ "NavigationMenuEditorRefresh": "ENGUser1"
+ }
+ },
+ "targetId": "9ebb5bcb-8e8f-4bd0-ab01-231cc5aed2bc",
+ "type": "componentVariant"
}
- },
- "targetId": "9ebb5bcb-8e8f-4bd0-ab01-231cc5aed2bc",
- "type": "componentVariant"
- }
- ],
- "developerName": "Default_Navigation_Menu_Component_Properties",
- "id": "17c75696-bc3e-429d-86f0-966bdc3e9713",
- "type": "experienceVariation"
+ ],
+ "developerName": "Default_Navigation_Menu_Component_Properties",
+ "id": "17c75696-bc3e-429d-86f0-966bdc3e9713",
+ "type": "experienceVariation"
}
--
Gitblit v1.9.1