fix syntax errors preventing compilation

probably the result of a bad merge
alexed1 · Sep 5, 2024 · 0da49a8 · 0da49a8
1 parent 401970d
commit 0da49a8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/flow_action_components/CloneAndTweak/force-app/main/default/classes/ModifyFlowMetadata.cls b/flow_action_components/CloneAndTweak/force-app/main/default/classes/ModifyFlowMetadata.cls
@@ -10,11 +10,7 @@ global with sharing class ModifyFlowMetadata {
         for (Request curRequest: requestList ){
             try{
                 Result curResult = new Result();
-<<<<<<< Updated upstream
                 usf3.MetadataService.Flow flow = Test.isRunningTest() ? ModifyFlowMetadataTest.genereateFlowForTest() : usf3.MetadataUtils.getFlowMetadataFromName(curRequest.flowName)[0];
-=======
-                usf3.MetadataService.Flow flow = Test.isRunningTest() ? ModifyFlowMetadataTest.genereateFlowForTest() : usf3.MetadataUtils.GetFlowMetadataFromName(curRequest.flowName)[0];
->>>>>>> Stashed changes
 
                 if(String.isNotEmpty(curRequest.entityPath1)) {
                     modifyFlow(flow, curRequest.entityPath1, curRequest.value1);
@@ -289,4 +285,4 @@ global with sharing class ModifyFlowMetadata {
         return flowName.replaceAll('[^a-zA-Z0-9]+', '_');
     }
     public class InvocableActionException extends Exception{}
-}
+}
diff --git a/...components/FlowBaseComponents/force-app/main/default/classes/fbc_FormulaEvaluatorTest.cls b/...components/FlowBaseComponents/force-app/main/default/classes/fbc_FormulaEvaluatorTest.cls
@@ -2,8 +2,6 @@
 public with sharing class fbc_FormulaEvaluatorTest {
     @IsTest
     static void parseFormulaTest() {
-
-            static void parseFormulaTest() {
 
         Profile pfile = [select id from profile where Name='System Administrator' limit 1];
         User usr = new User( alias='utest', email='[email protected]', emailencodingkey='UTF-8',FirstName = 'beta',lastname='Tester',