conflict

Uniswap · Feb 17, 2024 · ba9ac98 · ba9ac98
1 parent df66cab
commit ba9ac98
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/entities/pair.test.ts b/src/entities/pair.test.ts
@@ -1,16 +1,8 @@
-<<<<<<< Updated upstream
-import { BigNumber } from '@ethersproject/bignumber'
-import { ChainId, CurrencyAmount, Price, Token, WETH9 } from '@uniswap/sdk-core'
-import { FACTORY_ADDRESS } from 'constants'
-import { InsufficientInputAmountError } from '../errors'
-import { computePairAddress, Pair } from './pair'
-=======
 import {BigNumber} from '@ethersproject/bignumber'
 import {ChainId, CurrencyAmount, Price, Token, WETH9} from '@uniswap/sdk-core'
 import {FACTORY_ADDRESS} from '../constants';
 import {InsufficientInputAmountError} from '../errors'
 import {computePairAddress, Pair} from './pair'
->>>>>>> Stashed changes
 
 describe('computePairAddress', () => {
   it('should correctly compute the pool address', () => {