Skip to content

Commit c382748

Browse files
committed
fix
1 parent d1422b4 commit c382748

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

  • framework/components/blockchain

framework/components/blockchain/sui.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,8 @@ func newSui(ctx context.Context, in *Input) (*Output, error) {
226226
"--force-regenesis",
227227
"--with-faucet",
228228
},
229-
<<<<<<< HEAD
230-
Files: files,
231-
=======
232229
Files: files,
233230
// we need faucet for funding
234-
>>>>>>> main
235231
WaitingFor: wait.ForListeningPort(DefaultFaucetPort).WithStartupTimeout(1 * time.Minute).WithPollInterval(200 * time.Millisecond),
236232
}
237233

0 commit comments

Comments
 (0)