DPP version return string

2020-11-29 23:55:05 +08:00
parent b855c50f01
commit 544b4c7c29
1 changed files with 0 additions and 5 deletions
--- a/contracts/DODOPrivatePool/impl/DPP.sol
+++ b/contracts/DODOPrivatePool/impl/DPP.sol
@@ -46,13 +46,8 @@ 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
    }
 }