fixed merge conflict

CanzaApps · Apr 15, 2024 · 89a7a91 · 89a7a91
2 parents a3c6157 + e78fca6
commit 89a7a91
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/contracts/Oracle.sol b/contracts/Oracle.sol
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: MIT
+
 pragma solidity 0.8.20;
 
 import "@openzeppelin/contracts/access/AccessControl.sol";

diff --git a/contracts/Vault.sol b/contracts/Vault.sol
@@ -1,11 +1,5 @@
 // SPDX-License-Identifier: MIT
 
-/**
- * NOTE
- * Always do additions first
- * Check if the substracting value is greater than or less than the added values i.e check for a negative result
- */
-
 pragma solidity ^0.8.20;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";

diff --git a/contracts/interfaces/BakiOracleInterface.sol b/contracts/interfaces/BakiOracleInterface.sol
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: MIT
+
 pragma solidity 0.8.20;
 /**
 * @dev Oracle interface