Skip to content

Commit 23bb07f

Browse files
committed
fix(rebalancer): remove conflict markers
1 parent bef9066 commit 23bb07f

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

typescript/rebalancer/src/core/InventoryRebalancer.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
getSignerForChain,
1616
type TypedTransactionReceipt,
1717
} from '@hyperlane-xyz/sdk';
18-
<<<<<<< HEAD
1918
import {
2019
ProtocolType,
2120
assert,
@@ -96,7 +95,6 @@ type InventoryMovementExecutionResult =
9695
success: false;
9796
error: string;
9897
};
99-
10098
const RECOVERABLE_MAX_TRANSFER_ERROR_MESSAGES = [
10199
'balance may be insufficient',
102100
'transfer amount exceeds balance',

0 commit comments

Comments
 (0)