chore: resolve more conflicts

FuelLabs · Feb 20, 2025 · 0ee5371 · 0ee5371
2 parents b11e4bd + bc02a46
commit 0ee5371
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 112 deletions.
diff --git a/packages/integration-tests/tests/bridge_erc721.ts b/packages/integration-tests/tests/bridge_erc721.ts
@@ -48,9 +48,6 @@ describe.skip('Bridging ERC721 tokens', async function () {
   this.timeout(DEFAULT_TIMEOUT_MS);
 
   before(async () => {
-    // // spinning up all docker containers
-    // await startContainers();
-
     env = await setupEnvironment({});
     eth_testToken = await getOrDeployERC721Contract(env);
     eth_testTokenAddress = (await eth_testToken.getAddress()).toLowerCase();

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml