Commit a12257d
committed
merge: sync challenge-6-stable-coin with base-challenge-template
Resolves recurring conflict from #355/#371/#374. Previous resolutions
were squash-merged, which never advanced the merge-base, so every
subsequent sync re-diffed from the same 11-commit-old point (a7fc831)
and reproduced the conflict. This is a real merge commit to fix that.
# Conflicts:
# .github/workflows/main.yml
# .github/workflows/sync_other_challenges.yaml
# packages/snfoundry/contracts/Scarb.toml
# packages/snfoundry/contracts/src/your_contract.cairo
# packages/snfoundry/contracts/tests/test_contract.cairo4 files changed
Lines changed: 6 additions & 5 deletions
File tree
- .github/workflows
- packages/nextjs
- services/web3
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
602 | 602 | | |
603 | 603 | | |
604 | 604 | | |
605 | | - | |
606 | | - | |
| 605 | + | |
| 606 | + | |
607 | 607 | | |
608 | 608 | | |
609 | 609 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
0 commit comments