From e5151c3b8ac5bf0cd64e6b8f298c88c5f3476101 Mon Sep 17 00:00:00 2001
From: edwardmack <ed@edwardmack.com>
Date: Tue, 5 Nov 2019 16:26:25 -0500
Subject: [PATCH] merge branch

Signed-off-by: edwardmack <ed@edwardmack.com>
---
 .../besu/ethereum/mainnet/MainnetDifficultyCalculators.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java
index c4628ecee6e..84fede69ddd 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java
@@ -56,7 +56,7 @@ private MainnetDifficultyCalculators() {}
       };
 
   public static DifficultyCalculator<Void> HOMESTEAD =
-      (time, parent, protogit colContext) -> {
+      (time, parent, protocolContext) -> {
         final BigInteger parentDifficulty = difficulty(parent.getDifficulty());
         final BigInteger difficulty =
             ensureMinimumDifficulty(