Merge branch 'main' into update-coa-deploy

onflow · Apr 26, 2024 · 98d64d5 · 98d64d5
2 parents 1a10bd0 + 6cc0530
commit 98d64d5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 20 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@ ______
 
 For contributor use:
 
-- [ ] Targeted PR against `master` branch
+- [ ] Targeted PR against `main` branch
 - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
 - [ ] Code follows the [standards mentioned here](https://github.com/onflow/flow-evm-bridge/blob/master/CONTRIBUTING.md#styleguides).
 - [ ] Updated relevant documentation 

diff --git a/README.md b/README.md
@@ -179,7 +179,7 @@ return true.
 In both cases, `allowsBridging()` gates onboarding to the bridge. Once onboarded - **a permissionless operation anyone can
 execute** - the value of `allowsBridging()` is irrelevant and assets can move between VMs permissionlessly.
 
-## Under the Hood (facilitating cross-vm interactions)
+## Under the Hood
 
 For an in-depth look at the high-level architecture of the bridge, see [FLIP
 #237](https://github.com/onflow/flips/pull/233)

diff --git a/cadence/args/bridged-nft-code-chunks-args-emulator.json b/cadence/args/bridged-nft-code-chunks-args-emulator.json
diff --git a/cadence/args/bridged-nft-code-chunks-args-previewnet.json b/cadence/args/bridged-nft-code-chunks-args-previewnet.json
diff --git a/cadence/args/bridged-token-code-chunks-args-emulator.json b/cadence/args/bridged-token-code-chunks-args-emulator.json
diff --git a/cadence/args/bridged-token-code-chunks-args-previewnet.json b/cadence/args/bridged-token-code-chunks-args-previewnet.json
diff --git a/cadence/contracts/bridge/interfaces/CrossVMNFT.cdc b/cadence/contracts/bridge/interfaces/CrossVMNFT.cdc
@@ -4,7 +4,7 @@ import "MetadataViews"
 
 import "EVM"
 
-/// Contract defining cross-VM NFT-related interfaces & Metadata views
+/// Contract defining cross-VM NFT-related interfaces
 ///
 access(all) contract CrossVMNFT {