fixconflict

buli

2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81

 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>