Skip to content

Commit 4fd1592

Browse files
committed
fix: resolve public-next into next merge conflict (sequencer-publisher.test.ts imports)
1 parent 7011187 commit 4fd1592

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,8 @@ import {
4747
} from 'viem';
4848
import { privateKeyToAccount } from 'viem/accounts';
4949

50-
<<<<<<< HEAD
5150
import type { PublisherConfig, SequencerPublisherConfig, TxSenderConfig } from './config.js';
52-
=======
53-
import type { PublisherConfig, TxSenderConfig } from './config.js';
5451
import { type FailedL1Tx, FailedL1TxSchema } from './l1_tx_failed_store/index.js';
55-
>>>>>>> origin/public-next
5652
import type { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
5753
import { type Action, SequencerPublisher, compareActions } from './sequencer-publisher.js';
5854

0 commit comments

Comments
 (0)