From b87e48c113cffb08f5b3e8a262ff3ab8dfe57c70 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Thu, 5 Jul 2018 16:51:37 +0200
Subject: Fix merge conflicts

---
 .../src/contract_wrappers/contract_wrapper.ts                |  2 +-
 packages/contract-wrappers/test/erc20_wrapper_test.ts        | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'packages')

diff --git a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
index b8ca4d29b..9688edce2 100644
--- a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
@@ -32,7 +32,7 @@ export abstract class ContractWrapper {
     public abstract abi: ContractAbi;
     protected _web3Wrapper: Web3Wrapper;
     protected _networkId: number;
-    private _blockAndLogStreamerIfExists: BlockAndLogStreamer<Block, Log> | undefined;
+    private _blockAndLogStreamerIfExists: BlockAndLogStreamer | undefined;
     private _blockPollingIntervalMs: number;
     private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
     private _filters: { [filterToken: string]: FilterObject };
diff --git a/packages/contract-wrappers/test/erc20_wrapper_test.ts b/packages/contract-wrappers/test/erc20_wrapper_test.ts
index ae47a11ad..0011508e0 100644
--- a/packages/contract-wrappers/test/erc20_wrapper_test.ts
+++ b/packages/contract-wrappers/test/erc20_wrapper_test.ts
@@ -528,11 +528,7 @@ describe('ERC20Wrapper', () => {
         it('Outstanding subscriptions are cancelled when contractWrappers.setProvider called', (done: DoneCallback) => {
             (async () => {
                 const callbackNeverToBeCalled = callbackErrorReporter.reportNodeCallbackErrors(done)(
-<<<<<<< HEAD:packages/contract-wrappers/test/erc20_wrapper_test.ts
-                    (logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => {
-=======
-                    (_logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
->>>>>>> v2-prototype:packages/contract-wrappers/test/token_wrapper_test.ts
+                    (_logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => {
                         done(new Error('Expected this subscription to have been cancelled'));
                     },
                 );
@@ -561,11 +557,7 @@ describe('ERC20Wrapper', () => {
         it('Should cancel subscription when unsubscribe called', (done: DoneCallback) => {
             (async () => {
                 const callbackNeverToBeCalled = callbackErrorReporter.reportNodeCallbackErrors(done)(
-<<<<<<< HEAD:packages/contract-wrappers/test/erc20_wrapper_test.ts
-                    (logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => {
-=======
-                    (_logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => {
->>>>>>> v2-prototype:packages/contract-wrappers/test/token_wrapper_test.ts
+                    (_logEvent: DecodedLogEvent<ERC20TokenApprovalEventArgs>) => {
                         done(new Error('Expected this subscription to have been cancelled'));
                     },
                 );
-- 
cgit v1.2.3