cleaned up config

0xstardust · Jun 23, 2021 · d7769b4 · d7769b4
1 parent fd56ce1
commit d7769b4
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/scripts/config.ts b/scripts/config.ts
@@ -12,13 +12,9 @@ export const mainConfig: DeployParams = [
 ]
 
 export const lottoConfig: LotteryParams = [
-<<<<<<< HEAD
     "0xa36085F69e2889c224210F603D836748e7dC0088", // Link address
-=======
-    "0xa36085F69e2889c224210F603D836748e7dC0088", // Link address again !!! FIX ME
->>>>>>> 75a933cf62cb1ca82fde8b3c63360905a43f5d10
     "0xdD3782915140c8f3b190B5D67eAc6dc5760C46E9", // Coordinator
     "0xa36085F69e2889c224210F603D836748e7dC0088", // LINK address
     ethers.utils.parseEther(".1"), // VRF price
     "0x6c3699283bda56ad74f6b855546325b68d482e983852a7a82979cc4807b641f4" // KeyHash
-]
+]