Fix nav.

buildkite · Sep 12, 2024 · 24d4bda · 24d4bda
1 parent fb6df0c
commit 24d4bda
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/data/nav.yml b/data/nav.yml
@@ -557,19 +557,12 @@
             - name: "Members"
               path: "apis/rest-api/organizations/members"
               pill: "beta"
-<<<<<<< HEAD
-        - name: "Packages"
-          children:
-            - name: "Packages"
-              path: "apis/rest-api/packages/packages"
-=======
         - name: "Packages "
           # Keep space at end to prevent "Packages" in global nav bar being
           # highlighted when any child page of "API > REST > Packages" is selected.
           children:
             - name: "Registries"
               path: "apis/rest-api/packages/registries"
->>>>>>> docs-public/main
         - name: "Pipelines "
           # Keep space at end to prevent "Pipelines" in global nav bar being
           # highlighted when any child page of "API > REST > Pipelines" is selected.