aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-03-20 01:06:54 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-03-20 01:06:54 +0800
commitd4dce41d3ae1bcfadd4f59947693d1f8c9bb6fa0 (patch)
treeebf4e6d52984ce1b16456a440002bb803b06c6d6
parent293b55e51f735355ce4d715b5d4259e51589ce43 (diff)
downloaddexon-0x-contracts-d4dce41d3ae1bcfadd4f59947693d1f8c9bb6fa0.tar.gz
dexon-0x-contracts-d4dce41d3ae1bcfadd4f59947693d1f8c9bb6fa0.tar.zst
dexon-0x-contracts-d4dce41d3ae1bcfadd4f59947693d1f8c9bb6fa0.zip
Fix bad merge
-rw-r--r--packages/react-docs-example/package.json1
-rw-r--r--packages/react-shared/package.json2
2 files changed, 1 insertions, 2 deletions
diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json
index 51caca505..73705c979 100644
--- a/packages/react-docs-example/package.json
+++ b/packages/react-docs-example/package.json
@@ -40,7 +40,6 @@
"shx": "^0.2.2",
"source-map-loader": "^0.2.3",
"style-loader": "^0.20.2",
- "shx": "^0.2.2",
"tslint": "^5.9.1",
"typescript": "2.7.1",
"webpack": "^3.11.0",
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 2125fffdd..77e29a504 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -26,7 +26,7 @@
"@0xproject/tslint-config": "^0.4.12",
"copyfiles": "^1.2.0",
"shx": "^0.2.2",
- "tslint": "5.8.0",
+ "tslint": "^5.9.1",
"typescript": "2.7.1"
},
"dependencies": {