fix: conflicts

marsfoundation · Jun 14, 2024 · 2bb7f19 · 2bb7f19
2 parents 01ed799 + 4336079
commit 2bb7f19
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Executor.sol b/src/Executor.sol
@@ -100,7 +100,7 @@ contract Executor is IExecutor, AccessControl {
             isActionQueued[actionHash] = true;
         }
 
-        ActionsSet storage actionsSet =_actionsSets[actionsSetId];
+        ActionsSet storage actionsSet = _actionsSets[actionsSetId];
 
         actionsSet.targets           = targets;
         actionsSet.values            = values;
@@ -124,7 +124,7 @@ contract Executor is IExecutor, AccessControl {
     function execute(uint256 actionsSetId) external payable override {
         if (getCurrentState(actionsSetId) != ActionsSetState.Queued) revert OnlyQueuedActions();
 
-        ActionsSet storage actionsSet =_actionsSets[actionsSetId];
+        ActionsSet storage actionsSet = _actionsSets[actionsSetId];
 
         if (block.timestamp < actionsSet.executionTime) revert TimelockNotFinished();