aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2017-12-14 04:37:01 +0800
committerBrandon Millman <brandon.millman@gmail.com>2017-12-14 04:37:01 +0800
commit19d844998179aa92b2a60b2e21cb6251248ba492 (patch)
treec7f534091a80a4a0839fc6330ddd5b5dfd5c155f /packages
parent91f276d9254bba3d93fc821c4fadab2eb6fc1d65 (diff)
parent6bda6a22e3551707e7069e8ad6ea34d1ba0abd4d (diff)
downloaddexon-sol-tools-19d844998179aa92b2a60b2e21cb6251248ba492.tar
dexon-sol-tools-19d844998179aa92b2a60b2e21cb6251248ba492.tar.gz
dexon-sol-tools-19d844998179aa92b2a60b2e21cb6251248ba492.tar.bz2
dexon-sol-tools-19d844998179aa92b2a60b2e21cb6251248ba492.tar.lz
dexon-sol-tools-19d844998179aa92b2a60b2e21cb6251248ba492.tar.xz
dexon-sol-tools-19d844998179aa92b2a60b2e21cb6251248ba492.tar.zst
dexon-sol-tools-19d844998179aa92b2a60b2e21cb6251248ba492.zip
Merge branch 'development' into feature/addKovanFaucets
* development: Add new packages to main README Remove redundant totalSupply from token interface
Diffstat (limited to 'packages')
-rw-r--r--packages/contracts/contracts/tokens/Token_v2.sol3
-rw-r--r--packages/website/package.json2
2 files changed, 1 insertions, 4 deletions
diff --git a/packages/contracts/contracts/tokens/Token_v2.sol b/packages/contracts/contracts/tokens/Token_v2.sol
index 027f706f4..e1088c560 100644
--- a/packages/contracts/contracts/tokens/Token_v2.sol
+++ b/packages/contracts/contracts/tokens/Token_v2.sol
@@ -2,9 +2,6 @@ pragma solidity 0.4.18;
contract Token_v2 {
- /// @return total amount of tokens
- function totalSupply() public view returns (uint) {}
-
/// @notice send `_value` token to `_to` from `msg.sender`
/// @param _to The address of the recipient
/// @param _value The amount of token to be transferred
diff --git a/packages/website/package.json b/packages/website/package.json
index d52cfc6ff..a6703af7e 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,5 +1,5 @@
{
- "name": "website",
+ "name": "@0xproject/website",
"version": "0.0.2",
"private": true,
"description": "Website and 0x portal dapp",