aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-07-10 02:08:28 +0800
committerGitHub <noreply@github.com>2018-07-10 02:08:28 +0800
commit4b60a3cbab3a97125499cb89d9c253deebfb7d2d (patch)
tree3cd745f49d55406e95453bf3efac6383fba5f038 /packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol
parent9f08916cf18ad3e2686811933116122eea0890b9 (diff)
parent17956efe351e3ec0b1e9cdeee8292ebb0b4e563c (diff)
downloaddexon-0x-contracts-4b60a3cbab3a97125499cb89d9c253deebfb7d2d.tar
dexon-0x-contracts-4b60a3cbab3a97125499cb89d9c253deebfb7d2d.tar.gz
dexon-0x-contracts-4b60a3cbab3a97125499cb89d9c253deebfb7d2d.tar.bz2
dexon-0x-contracts-4b60a3cbab3a97125499cb89d9c253deebfb7d2d.tar.lz
dexon-0x-contracts-4b60a3cbab3a97125499cb89d9c253deebfb7d2d.tar.xz
dexon-0x-contracts-4b60a3cbab3a97125499cb89d9c253deebfb7d2d.tar.zst
dexon-0x-contracts-4b60a3cbab3a97125499cb89d9c253deebfb7d2d.zip
Merge branch 'v2-prototype' into abi-gen-ignore-unchanged
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol b/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol
index effff82e0..7507d3da1 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol
@@ -16,7 +16,7 @@
*/
-pragma solidity ^0.4.24;
+pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
import "./libs/LibConstants.sol";
@@ -28,6 +28,7 @@ import "./MixinTransactions.sol";
import "./MixinMatchOrders.sol";
+// solhint-disable no-empty-blocks
contract Exchange is
MixinExchangeCore,
MixinMatchOrders,