From 04930d454929bb667065ae9fce019afcddee6857 Mon Sep 17 00:00:00 2001
From: bhavik-m <bhavikmehta2001@gmail.com>
Date: Sat, 2 Apr 2022 23:57:09 +0530
Subject: [PATCH] minor fix

---
 contracts/mainnet/connectors/instaLite/main.sol | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/contracts/mainnet/connectors/instaLite/main.sol b/contracts/mainnet/connectors/instaLite/main.sol
index d91c8418..d68de918 100644
--- a/contracts/mainnet/connectors/instaLite/main.sol
+++ b/contracts/mainnet/connectors/instaLite/main.sol
@@ -99,7 +99,6 @@ abstract contract InstaLiteConnector is Events, Basic {
 		setUint(setIds[0], _amt);
 		setUint(setIds[1], vTokenAmt);
 
-<<<<<<< HEAD:contracts/mainnet/connectors/instaLite/main.sol
 		_eventName = "LogWithdraw(address,uint256,uint256,address,uint256,uint256[])";
 		_eventParam = abi.encode(
 			vaultAddress,
@@ -109,10 +108,6 @@ abstract contract InstaLiteConnector is Events, Basic {
 			getId,
 			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
 	}
 }