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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 1b4f021..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
@@ -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,9 +126,13 @@
</classAccesses>
<flowAccesses>
<enabled>true</enabled>
+<<<<<<< HEAD
<flow>
CommunityWeeklyReport;
- </flow>
+ </flow>
+=======
+ <flow>CommunityWeeklyReport</flow>
+>>>>>>> LEXCommunityLiJun
</flowAccesses>
<hasActivationRequired>false</hasActivationRequired>
<label>Community Consumable LEX PS</label>
--
Gitblit v1.9.1