Skip to content

Commit

Permalink
Remove leftover merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Gudahtt committed Mar 12, 2024
1 parent c8a332d commit 4be5554
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions test/e2e/tests/request-queuing/multiple-networks-dapps-txs.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,6 @@ describe('Request Queuing for Multiple Dapps and Txs on different networks.', fu
await driver.switchToWindowWithTitle(
WINDOW_TITLES.ExtensionInFullScreenView,
);
<<<<<<< HEAD

await driver.findElement({
css: '[data-testid="network-switch-from-network"]',
text: 'Localhost 8545',
});

await driver.findElement({
css: '[data-testid="network-switch-to-network"]',
text: 'Localhost 8546',
});

// Switch Network
await driver.clickElement({ text: 'Switch network', tag: 'button' });
=======
>>>>>>> 589b95d5a7 (WIP)

// Check for unconfirmed transaction in tx list
await driver.wait(async () => {
Expand Down

0 comments on commit 4be5554

Please sign in to comment.