🔀 resolve merge conflicts

Kwenta · Oct 11, 2024 · dc6b119 · dc6b119
1 parent 989ffeb
commit dc6b119
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 22 deletions.
diff --git a/src/utils/zap/Zap.sol b/src/utils/zap/Zap.sol
@@ -238,14 +238,7 @@ contract Zap is Reentrancy, Errors {
         uint256 _amount,
         uint256 _tolerance,
         address _receiver
-<<<<<<< HEAD
     ) external returns (uint256 received, address synth) {
-=======
-    )
-        external
-        returns (uint256 received, address synth)
-    {
->>>>>>> 4af916b (👷 pull latest zap)
         synth = ISpotMarket(SPOT_MARKET).getSynth(_synthId);
         _pull(USDX, msg.sender, _amount);
         received = _buy(_synthId, _amount, _tolerance);

diff --git a/src/utils/zap/interfaces/IERC20.sol b/src/utils/zap/interfaces/IERC20.sol
@@ -6,14 +6,7 @@ interface IERC20 {
 
     function balanceOf(address account) external view returns (uint256);
 
-<<<<<<< HEAD
     function allowance(address owner, address spender)
-=======
-    function allowance(
-        address owner,
-        address spender
-    )
->>>>>>> 4af916b (👷 pull latest zap)
         external
         view
         returns (uint256);

diff --git a/src/utils/zap/utils/Flush.sol b/src/utils/zap/utils/Flush.sol
@@ -6,10 +6,6 @@ import {IERC20} from "../interfaces/IERC20.sol";
 /// @title token flushing utility
 /// @author @jaredborders
 contract Flush {
-<<<<<<< HEAD
-=======
-
->>>>>>> 4af916b (👷 pull latest zap)
     /// @custom:plumber
     address public PLUMBER;
 
@@ -38,8 +34,4 @@ contract Flush {
         require(msg.sender == PLUMBER, OnlyPlumber());
         PLUMBER = _newPlumber;
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> 4af916b (👷 pull latest zap)
 }