Commit 1e2e745

committed

fix: resolve cherry-pick conflicts

Deleted files (version-v4.2.0-aztecnr-rc.2 versioned docs and example_swap) don't exist on v4-next branch — accept deletion. Resolved content conflict in counter_contract.md by taking the incoming (PR) version which better describes the current aztec new behavior.

1 parent 459e929 commit 1e2e745Copy full SHA for 1e2e745

6 files changed

docs
- developer_versioned_docs/version-v4.2.0-aztecnr-rc.2/docs/tutorials
  - contract_tutorials
  - js_tutorials
    - token_bridge.md
- docs-developers/docs/tutorials/contract_tutorials
  - counter_contract.md
- examples/ts/example_swap
  - index.ts

`‎docs/developer_versioned_docs/version-v4.2.0-aztecnr-rc.2/docs/tutorials/contract_tutorials/counter_contract.md‎`

This file was deleted.

Comments

(0)