From 105b9273975b34d46dc98254846d2b31990d9d9a Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 26 Jun 2018 08:43:37 +0200
Subject: Fix merge issues

---
 packages/contracts/src/utils/erc20_wrapper.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/contracts/src/utils/erc20_wrapper.ts')

diff --git a/packages/contracts/src/utils/erc20_wrapper.ts b/packages/contracts/src/utils/erc20_wrapper.ts
index 6dd717f4a..652f29726 100644
--- a/packages/contracts/src/utils/erc20_wrapper.ts
+++ b/packages/contracts/src/utils/erc20_wrapper.ts
@@ -19,7 +19,7 @@ export class ERC20Wrapper {
     private _provider: Provider;
     private _dummyTokenContracts: DummyERC20TokenContract[];
     private _proxyContract?: ERC20ProxyContract;
-    private _proxyIdIfExists?: number;
+    private _proxyIdIfExists?: string;
     constructor(provider: Provider, tokenOwnerAddresses: string[], contractOwnerAddress: string) {
         this._dummyTokenContracts = [];
         this._web3Wrapper = new Web3Wrapper(provider);
@@ -55,9 +55,9 @@ export class ERC20Wrapper {
         this._proxyIdIfExists = await this._proxyContract.getProxyId.callAsync();
         return this._proxyContract;
     }
-    public getProxyId(): number {
+    public getProxyId(): string {
         this._validateProxyContractExistsOrThrow();
-        return this._proxyIdIfExists as number;
+        return this._proxyIdIfExists as string;
     }
     public async setBalancesAndAllowancesAsync(): Promise<void> {
         this._validateDummyTokenContractsExistOrThrow();
-- 
cgit v1.2.3