Merge remote-tracking branch 'origin/c1-migration' into c1-migration

# Conflicts: # cadence/contracts/TopShot.cdc # cadence/contracts/TopShotLocking.cdc
onflow · Dec 3, 2024 · 4bc0a15 · 4bc0a15
2 parents ca7ce88 + 09649f2
commit 4bc0a15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/cadence_lint.yml b/.github/workflows/cadence_lint.yml
@@ -1,4 +1,4 @@
-name: Run Cadence Lint
+name: Run Cadence Contract Compilation, Deployment, Transaction Excution, and Lint
 on: push
 
 jobs:

diff --git a/cadence/contracts/Recipe.cdc b/cadence/contracts/Recipe.cdc
@@ -1,6 +1,7 @@
 import "TopShot"
 
 access(all) contract Recipe {
+    // This is a snippet extracting the relevant logic from the TopShot contract for demonstration purposes
     // More TopShot Code Above
 
     access(all) event PlayAddedToSet(setID: UInt32, playID: UInt32)