Post rebase lint

circlefin · Oct 25, 2022 · 4789f39 · 4789f39
1 parent 63e8b3b
commit 4789f39
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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];