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/permissionsets/Community_Consumable_LEX_PS.permissionset-meta.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/permissionsets/Community_Consumable_LEX_PS.permissionset-meta.xml b/force-app/main/default/permissionsets/Community_Consumable_LEX_PS.permissionset-meta.xml
index 328cd0d..8a64f42 100644
--- a/force-app/main/default/permissionsets/Community_Consumable_LEX_PS.permissionset-meta.xml
+++ b/force-app/main/default/permissionsets/Community_Consumable_LEX_PS.permissionset-meta.xml
@@ -126,7 +126,13 @@
</classAccesses>
<flowAccesses>
<enabled>true</enabled>
+<<<<<<< HEAD
+ <flow>
+CommunityWeeklyReport;
+ </flow>
+=======
<flow>CommunityWeeklyReport</flow>
+>>>>>>> LEXCommunityLiJun
</flowAccesses>
<hasActivationRequired>false</hasActivationRequired>
<label>Community Consumable LEX PS</label>
--
Gitblit v1.9.1