From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/permissionsets/Community_Consumable_LEX_PS.permissionset-meta.xml | 6 +-----
1 files changed, 1 insertions(+), 5 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 8a64f42..d26d5e1 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<PermissionSet xmlns="http://soap.sforce.com/2006/04/metadata">
<classAccesses>
<apexClass>LexArriveGoodsController</apexClass>
@@ -126,13 +126,9 @@
</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