Resolve merge conflicts

MaedahBatool · MaedahBatool · commit 76213c563e75 · 2024-11-20T17:07:27.000-08:00
diff --git a/src/data/navigation.ts b/src/data/navigation.ts
@@ -42,6 +42,12 @@ export const navigation: NavigationItem[] = [
 							{ title: "Model Configuration", href: "/cody/clients/model-configuration", },
 						]
 					},
+					{
+						title: "Model Configuration", href: "/cody/model-configuration",
+						subsections: [
+							{ title: "Examples", href: "/cody/model-configuration/examples", },
+						]
+					},
 					{
 						title: "Capabilities", href: "/cody/capabilities",
 						subsections: [

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,12 @@ export const navigation: NavigationItem[] = [`
`42`	`42`	`{ title: "Model Configuration", href: "/cody/clients/model-configuration", },`
`43`	`43`	`]`
`44`	`44`	`},`
	`45`	`+ {`
	`46`	`+ title: "Model Configuration", href: "/cody/model-configuration",`
	`47`	`+ subsections: [`
	`48`	`+ { title: "Examples", href: "/cody/model-configuration/examples", },`
	`49`	`+ ]`
	`50`	`+ },`
`45`	`51`	`{`
`46`	`52`	`title: "Capabilities", href: "/cody/capabilities",`
`47`	`53`	`subsections: [`