Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
bhavik-m 2022-04-02 23:55:42 +05:30
commit e7427af1ff
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/mainnet/connectors/instaLite/main.sol
View File

@ -99,6 +99,7 @@ abstract contract InstaLiteConnector is Events, Basic {
setUint(setIds[0], _amt); setUint(setIds[0], _amt);
setUint(setIds[1], vTokenAmt); setUint(setIds[1], vTokenAmt);
<<<<<<< HEAD:contracts/mainnet/connectors/instaLite/main.sol
_eventName = "LogWithdraw(address,uint256,uint256,address,uint256,uint256[])"; _eventName = "LogWithdraw(address,uint256,uint256,address,uint256,uint256[])";
_eventParam = abi.encode( _eventParam = abi.encode(
vaultAddress, vaultAddress,
@ -108,6 +109,10 @@ abstract contract InstaLiteConnector is Events, Basic {
getId, getId,
setIds setIds
); );
=======
_eventName = "LogWithdraw(uint256,uint256,address,address,uint256,uint256[])";
_eventParam = abi.encode(_amt, vTokenAmt, to, instaLite, getId, setId);
>>>>>>> 8c668e6e2be93ef418eae3104cb4ee4c39f762b6:contracts/mainnet/connectors/instaLite/vault1/main.sol
} }
} }