Merge 88ce8f2 into 5af5b84

aragon · Feb 22, 2019 · 8e82e58 · 8e82e58
2 parents 5af5b84 + 88ce8f2
commit 8e82e58
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/contracts/acl/ACLSyntaxSugar.sol b/contracts/acl/ACLSyntaxSugar.sol
@@ -6,7 +6,9 @@ pragma solidity ^0.4.24;
 
 
 contract ACLSyntaxSugar {
-    function arr() internal pure returns (uint256[]) {}
+    function arr() internal pure returns (uint256[]) {
+        // solium-disable-previous-line no-empty-blocks
+    }
 
     function arr(bytes32 _a) internal pure returns (uint256[] r) {
         return arr(uint256(_a));

diff --git a/contracts/apps/AppProxyUpgradeable.sol b/contracts/apps/AppProxyUpgradeable.sol
@@ -14,7 +14,7 @@ contract AppProxyUpgradeable is AppProxyBase {
         AppProxyBase(_kernel, _appId, _initializePayload)
         public // solium-disable-line visibility-first
     {
-
+        // solium-disable-previous-line no-empty-blocks
     }
 
     /**

diff --git a/package.json b/package.json
@@ -37,10 +37,10 @@
     "eth-ens-namehash": "^2.0.8",
     "eth-gas-reporter": "^0.1.1",
     "ethereumjs-abi": "^0.6.5",
+    "ethlint": "^1.2.3",
     "ganache-cli": "^6.2.0",
     "mocha-lcov-reporter": "^1.3.0",
     "solidity-coverage": "0.5.8",
-    "solium": "^1.1.8",
     "truffle": "4.1.14",
     "truffle-bytecode-manager": "^1.1.1",
     "truffle-extract": "^1.2.1",