From 00a724635e0dac38cc04600bd6a5533b960eaf45 Mon Sep 17 00:00:00 2001 From: Stefan Bratanov Date: Mon, 20 Nov 2023 10:44:09 +0000 Subject: [PATCH] resolve conflict on rebase --- .../executionlayer/ExecutionLayerBlockProductionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerBlockProductionManager.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerBlockProductionManager.java index aa5dd6415d2..702a49cbe38 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerBlockProductionManager.java +++ b/ethereum/spec/src/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 getCachedPayloadResult(UInt64 slot);