Fix merge (stratisproject#967)

quantumagi · web-flow · commit 78c5311347b9 · 2022-04-30T20:56:36.000+10:00
diff --git a/src/Stratis.Bitcoin.Features.PoA/Voting/VotingManagerProcessBlock.cs b/src/Stratis.Bitcoin.Features.PoA/Voting/VotingManagerProcessBlock.cs
@@ -11,9 +11,9 @@ namespace Stratis.Bitcoin.Features.PoA.Voting
     public sealed class VotingManagerProcessBlock : EventBase
     {
         public ChainedHeaderBlock ConnectedBlock { get; }
-        public DBreeze.Transactions.Transaction PollsRepositoryTransaction { get; }
+        public PollsRepository.Transaction PollsRepositoryTransaction { get; }
 
-        public VotingManagerProcessBlock(ChainedHeaderBlock connectedBlock, DBreeze.Transactions.Transaction pollsRepositoryTransaction = null)
+        public VotingManagerProcessBlock(ChainedHeaderBlock connectedBlock, PollsRepository.Transaction pollsRepositoryTransaction = null)
         {
             this.ConnectedBlock = connectedBlock;
             this.PollsRepositoryTransaction = pollsRepositoryTransaction;

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ namespace Stratis.Bitcoin.Features.PoA.Voting`
`11`	`11`	`public sealed class VotingManagerProcessBlock : EventBase`
`12`	`12`	`{`
`13`	`13`	`public ChainedHeaderBlock ConnectedBlock { get; }`
`14`		`- public DBreeze.Transactions.Transaction PollsRepositoryTransaction { get; }`
	`14`	`+ public PollsRepository.Transaction PollsRepositoryTransaction { get; }`
`15`	`15`
`16`		`- public VotingManagerProcessBlock(ChainedHeaderBlock connectedBlock, DBreeze.Transactions.Transaction pollsRepositoryTransaction = null)`
	`16`	`+ public VotingManagerProcessBlock(ChainedHeaderBlock connectedBlock, PollsRepository.Transaction pollsRepositoryTransaction = null)`
`17`	`17`	`{`
`18`	`18`	`this.ConnectedBlock = connectedBlock;`
`19`	`19`	`this.PollsRepositoryTransaction = pollsRepositoryTransaction;`