From b6b533ee909db603136d3c7e2f598d1f75faa5e4 Mon Sep 17 00:00:00 2001
From: lander86 <luigi@horizenlabs.io>
Date: Wed, 24 Mar 2021 13:26:32 +0100
Subject: [PATCH] reslove conflict master<->dev

---
 sdk/src/main/scala/com/horizen/SidechainAppModule.scala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/src/main/scala/com/horizen/SidechainAppModule.scala b/sdk/src/main/scala/com/horizen/SidechainAppModule.scala
index f9504a1f6b..e176f6b872 100644
--- a/sdk/src/main/scala/com/horizen/SidechainAppModule.scala
+++ b/sdk/src/main/scala/com/horizen/SidechainAppModule.scala
@@ -54,6 +54,7 @@ abstract class SidechainAppModule extends com.google.inject.AbstractModule {
                     @Named("WalletBoxStorage")  walletBoxStorage: Storage,
                     @Named("WalletTransactionStorage")  walletTransactionStorage: Storage,
                     @Named("StateStorage")  stateStorage: Storage,
+                    @Named("StateForgerBoxStorage") forgerBoxStorage: Storage,
                     @Named("HistoryStorage")  historyStorage: Storage,
                     @Named("WalletForgingBoxesInfoStorage")  walletForgingBoxesInfoStorage: Storage,
                     @Named("ConsensusStorage")  consensusStorage: Storage,
@@ -77,6 +78,7 @@ abstract class SidechainAppModule extends com.google.inject.AbstractModule {
           walletBoxStorage,
           walletTransactionStorage,
           stateStorage,
+          forgerBoxStorage,
           historyStorage,
           walletForgingBoxesInfoStorage,
           consensusStorage,