From a1acf19ff3c1948214dde05a91eb3fbeac728d2c Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Wed, 18 Jul 2018 15:48:23 +0200
Subject: Fix a bad merge

---
 packages/migrations/artifacts/2.0.0/AssetProxyOwner.json | 8 +++++++-
 packages/migrations/artifacts/2.0.0/ERC20Proxy.json      | 8 +++++++-
 packages/migrations/artifacts/2.0.0/ERC721Proxy.json     | 8 +++++++-
 packages/migrations/artifacts/2.0.0/Exchange.json        | 8 +++++++-
 packages/migrations/artifacts/2.0.0/Forwarder.json       | 8 +++++++-
 packages/migrations/artifacts/2.0.0/WETH9.json           | 8 +++++++-
 packages/migrations/artifacts/2.0.0/ZRXToken.json        | 8 +++++++-
 7 files changed, 49 insertions(+), 7 deletions(-)

(limited to 'packages/migrations/artifacts')

diff --git a/packages/migrations/artifacts/2.0.0/AssetProxyOwner.json b/packages/migrations/artifacts/2.0.0/AssetProxyOwner.json
index f00f47779..80751855b 100644
--- a/packages/migrations/artifacts/2.0.0/AssetProxyOwner.json
+++ b/packages/migrations/artifacts/2.0.0/AssetProxyOwner.json
@@ -44468,5 +44468,11 @@
 			}
 		}
 	},
-	"networks": {}
+	"networks": {
+		"50": {
+			"address": "0x34d402f14d58e001d8efbe6585051bf9706aa064",
+			"links": {},
+			"constructorArgs": "[[\"0x5409ed021d9299bf6814279a6a1411a7e866a631\",\"0x6ecbe1db9ef729cbe972c83fb886247691fb6beb\"],[\"0x1dc4c1cefef38a777b15aa20260a54e584b16c48\",\"0x1d7022f5b17d2f8b695918fb48fa1089c9f85401\"],\"2\",\"0\"]"
+		}
+	}
 }
\ No newline at end of file
diff --git a/packages/migrations/artifacts/2.0.0/ERC20Proxy.json b/packages/migrations/artifacts/2.0.0/ERC20Proxy.json
index 82175bfb4..ed755fbed 100644
--- a/packages/migrations/artifacts/2.0.0/ERC20Proxy.json
+++ b/packages/migrations/artifacts/2.0.0/ERC20Proxy.json
@@ -252,5 +252,11 @@
 			}
 		}
 	},
-	"networks": {}
+	"networks": {
+		"50": {
+			"address": "0x1dc4c1cefef38a777b15aa20260a54e584b16c48",
+			"links": {},
+			"constructorArgs": "[]"
+		}
+	}
 }
\ No newline at end of file
diff --git a/packages/migrations/artifacts/2.0.0/ERC721Proxy.json b/packages/migrations/artifacts/2.0.0/ERC721Proxy.json
index 0784a9c52..5b6e68dfa 100644
--- a/packages/migrations/artifacts/2.0.0/ERC721Proxy.json
+++ b/packages/migrations/artifacts/2.0.0/ERC721Proxy.json
@@ -252,5 +252,11 @@
 			}
 		}
 	},
-	"networks": {}
+	"networks": {
+		"50": {
+			"address": "0x1d7022f5b17d2f8b695918fb48fa1089c9f85401",
+			"links": {},
+			"constructorArgs": "[]"
+		}
+	}
 }
\ No newline at end of file
diff --git a/packages/migrations/artifacts/2.0.0/Exchange.json b/packages/migrations/artifacts/2.0.0/Exchange.json
index 41926ec88..3add148b5 100644
--- a/packages/migrations/artifacts/2.0.0/Exchange.json
+++ b/packages/migrations/artifacts/2.0.0/Exchange.json
@@ -2148,5 +2148,11 @@
 			}
 		}
 	},
-	"networks": {}
+	"networks": {
+		"50": {
+			"address": "0x48bacb9266a570d521063ef5dd96e61686dbe788",
+			"links": {},
+			"constructorArgs": "[\"0xf47261b0000000000000000000000000871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c\"]"
+		}
+	}
 }
\ No newline at end of file
diff --git a/packages/migrations/artifacts/2.0.0/Forwarder.json b/packages/migrations/artifacts/2.0.0/Forwarder.json
index f4267ad94..479f9d2eb 100644
--- a/packages/migrations/artifacts/2.0.0/Forwarder.json
+++ b/packages/migrations/artifacts/2.0.0/Forwarder.json
@@ -892,5 +892,11 @@
 			}
 		}
 	},
-	"networks": {}
+	"networks": {
+		"50": {
+			"address": "0xb69e673309512a9d726f87304c6984054f87a93b",
+			"links": {},
+			"constructorArgs": "[\"0x48bacb9266a570d521063ef5dd96e61686dbe788\",\"0x0b1ba0af832d7c05fd64161e0db78e85978e8082\",\"0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c\",\"0xf47261b0000000000000000000000000871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c\",\"0xf47261b00000000000000000000000000b1ba0af832d7c05fd64161e0db78e85978e8082\"]"
+		}
+	}
 }
\ No newline at end of file
diff --git a/packages/migrations/artifacts/2.0.0/WETH9.json b/packages/migrations/artifacts/2.0.0/WETH9.json
index 56479981f..9c2c79938 100644
--- a/packages/migrations/artifacts/2.0.0/WETH9.json
+++ b/packages/migrations/artifacts/2.0.0/WETH9.json
@@ -326,5 +326,11 @@
 			}
 		}
 	},
-	"networks": {}
+	"networks": {
+		"50": {
+			"address": "0x0b1ba0af832d7c05fd64161e0db78e85978e8082",
+			"links": {},
+			"constructorArgs": "[]"
+		}
+	}
 }
\ No newline at end of file
diff --git a/packages/migrations/artifacts/2.0.0/ZRXToken.json b/packages/migrations/artifacts/2.0.0/ZRXToken.json
index 0c7d547eb..0ce91c1c1 100644
--- a/packages/migrations/artifacts/2.0.0/ZRXToken.json
+++ b/packages/migrations/artifacts/2.0.0/ZRXToken.json
@@ -10021,5 +10021,11 @@
 			}
 		}
 	},
-	"networks": {}
+	"networks": {
+		"50": {
+			"address": "0x871dd7c2b4b25e1aa18728e9d5f2af4c4e431f5c",
+			"links": {},
+			"constructorArgs": "[]"
+		}
+	}
 }
\ No newline at end of file
-- 
cgit v1.2.3