Merge branch 'v2-prototype' into abi-gen-ignore-unchanged

1 files changed, 7 insertions, 3 deletions

diff --git a/packages/contracts/src/2.0.0/tokens/ZRXToken/ZRXToken.sol b/packages/contracts/src/2.0.0/tokens/ZRXToken/ZRXToken.sol
index ed0670072..28c0b2fb3 100644
--- a/packages/contracts/src/2.0.0/tokens/ZRXToken/ZRXToken.sol
+++ b/packages/contracts/src/2.0.0/tokens/ZRXToken/ZRXToken.sol
@@ -16,20 +16,24 @@
 
 */
 
-pragma solidity ^0.4.11;
+pragma solidity 0.4.11;
 
+// solhint-disable-next-line max-line-length
 import { UnlimitedAllowanceToken_v1 as UnlimitedAllowanceToken } from "../../../1.0.0/UnlimitedAllowanceToken/UnlimitedAllowanceToken_v1.sol";
 
 
-
 contract ZRXToken is UnlimitedAllowanceToken {
 
+    // solhint-disable const-name-snakecase
     uint8 constant public decimals = 18;
     uint public totalSupply = 10**27; // 1 billion tokens, 18 decimal places
     string constant public name = "0x Protocol Token";
     string constant public symbol = "ZRX";
+    // solhint-enableconst-name-snakecase
 
-    function ZRXToken() {
+    function ZRXToken()
+        public
+    {
         balances[msg.sender] = totalSupply;
     }
 }