Commit 9badce9
committed
fix: resolve cherry-pick conflicts by reverting wrong target
The mechanical cherry-pick in the previous commit landed conflict markers
on version-v4.1.0-rc.2/docs/aztec-nr/api.mdx (a Testnet-labelled snapshot
whose existing name-based logic correctly returns "testnet" for names
containing "rc"). Revert that file to its pre-cherry-pick state — the
v4.2.0 mainnet fix does not apply to the v4.1.0-rc.2 testnet snapshot.
The equivalent change for v4-next is applied to docs-developers in the
next commit.1 parent a8f46eb commit 9badce9
1 file changed
Lines changed: 0 additions & 10 deletions
Lines changed: 0 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
| |||
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | 21 | | |
32 | 22 | | |
33 | 23 | | |
| |||
0 commit comments