From 4789f396538fcb5f5e27e4488a2181d570a5abba Mon Sep 17 00:00:00 2001
From: Adrian Soghoian <adrian.soghoian@contractor.circle.com>
Date: Tue, 25 Oct 2022 09:27:53 -0400
Subject: [PATCH] Post rebase lint

---
 test/Pool.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/Pool.test.ts b/test/Pool.test.ts
index b0bf7d0c..619cea87 100644
--- a/test/Pool.test.ts
+++ b/test/Pool.test.ts
@@ -400,7 +400,6 @@ describe("Pool", () => {
     });
   });
 
-<<<<<<< HEAD
   describe("previewDeposit()", async () => {
     it("includes interest when calculating deposit exchange rate", async () => {
       const lender = (await ethers.getSigners())[10];