fix bad merge

rainlanguage · Sep 7, 2023 · a4290fd · a4290fd
1 parent 11c01ec
commit a4290fd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/concrete/GenericPoolOrderBookV3FlashBorrower.meta.json b/src/concrete/GenericPoolOrderBookV3FlashBorrower.meta.json
@@ -1,9 +1,5 @@
 {
-<<<<<<< HEAD
     "name": "Generic pool order book v3 flash borrower",
-=======
-    "name": "Generic pool order book flash borrower",
->>>>>>> 29553542f23172cb378843a4a0089906daa3d96c
     "abiName": "GenericPoolOrderBookV3FlashBorrower",
     "desc": "A generic flash borrower that takes loans from an order book and can source external liquidity from any basic onchain AMM pool to cover the loan and specific orderbook orders. Supports expression based access gating.",
     "alias": "generic-pool-order-book-v3-flash-borrower",