Skip to content

Commit

Permalink
fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
vinistevam committed Oct 1, 2024
1 parent 224ce27 commit 3a51546
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion test/e2e/tests/transaction/edit-gas-fee.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const {
unlockWallet,
generateGanacheOptions,
WINDOW_TITLES,
createInternalTransaction,
} = require('../../helpers');
const FixtureBuilder = require('../../fixture-builder');

Expand Down
1 change: 0 additions & 1 deletion test/e2e/tests/transaction/send-edit.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const {
withFixtures,
unlockWallet,
generateGanacheOptions,
createInternalTransaction,
} = require('../../helpers');
const FixtureBuilder = require('../../fixture-builder');

Expand Down

0 comments on commit 3a51546

Please sign in to comment.