Merge branch 'feature/V2' of github.com:DODOEX/contractV2 into feature/V2

2020-11-29 23:54:47 +08:00
parent 271bd7b907 207593c8ec
commit b855c50f01
13 changed files with 666 additions and 17 deletions
--- a/contracts/DODOPrivatePool/impl/DPP.sol
+++ b/contracts/DODOPrivatePool/impl/DPP.sol
@@ -46,8 +46,13 @@ contract DPP is DPPTrader {
    }

    // ============ Version Control ============
+<<<<<<< HEAD

    function version() external pure returns (string memory) {
        return "DPP 1.0.0";
+=======
+    function version() external pure returns (uint256) {
+        return 1100; // DPP - 1.0.0
+>>>>>>> 207593c8ecdc05b481dc2ca6ef474e0fb7055c7b
    }
 }