Skip to content

Commit 9badce9

Browse files
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

File tree

  • docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr

docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/api.mdx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { useActiveVersion } from "@docusaurus/plugin-content-docs/client";
1010

1111
export const useApiVersion = () => {
1212
const version = useActiveVersion("developer");
13-
<<<<<<< HEAD:docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/api.mdx
1413
const versionName = version?.name || "current";
1514
// Map Docusaurus version to API docs folder
1615
// Use stable paths for nightly/devnet, version-specific for others
@@ -19,15 +18,6 @@ export const useApiVersion = () => {
1918
if (versionName.includes("devnet")) return "devnet";
2019
if (versionName.includes("rc") || versionName.includes("testnet")) return "testnet";
2120
return versionName;
22-
=======
23-
if (!version || version.name === "current") return "next";
24-
// Map Docusaurus version to API docs folder using version label
25-
// Labels are set explicitly in docusaurus.config.js (e.g., "Mainnet (...)")
26-
const label = version.label || "";
27-
if (label.startsWith("Alpha")) return "mainnet";
28-
if (label.startsWith("Testnet")) return "testnet";
29-
return version.name;
30-
>>>>>>> 0e1c4740b2 (fix(docs): use label-based API version mapping in v4.2.0 aztec-nr api page):docs/developer_versioned_docs/version-v4.2.0/docs/aztec-nr/api.mdx
3121
};
3222

3323
export const ModuleLink = ({ path, children }) => {

0 commit comments

Comments
 (0)