resolve conflict on rebase

Consensys · Nov 20, 2023 · 00a7246 · 00a7246
1 parent d7d01da
commit 00a7246
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerBlockProductionManager.java b/...main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerBlockProductionManager.java
@@ -90,7 +90,7 @@ ExecutionPayloadResult initiateBlockAndBlobsProduction(
   /**
    * Required {@link #initiateBlockProduction(ExecutionPayloadContext, BeaconState, boolean)} or
    * {@link #initiateBlockAndBlobsProduction(ExecutionPayloadContext, BeaconState, boolean)} to have
-   * been first in order for a value to be present
+   * been called first in order for a value to be present
    */
   Optional<ExecutionPayloadResult> getCachedPayloadResult(UInt64 slot);