fix compilation issue in executionengine post-merge

streamingfast · Feb 26, 2024 · 16739dc · 16739dc
1 parent 54aa954
commit 16739dc
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/execution/gethexec/executionengine.go b/execution/gethexec/executionengine.go
@@ -471,15 +471,11 @@ func (s *ExecutionEngine) createBlockFromNextMessage(msg *arbostypes.MessageWith
 		statedb,
 		s.bc,
 		s.bc.Config(),
-		//<<<<<<< HEAD
-		//  s.streamer.FetchBatch,
-		//  s.logger,
-		//=======
 		func(batchNum uint64) ([]byte, error) {
 			data, _, err := s.streamer.FetchBatch(batchNum)
 			return data, err
 		},
-		//>>>>>>> v2.3.0
+		s.logger,
 	)
 
 	return block, statedb, receipts, err