From 6c2ac4a70b4aa1b50d85245c2da47830abb1750d Mon Sep 17 00:00:00 2001
From: userquin <userquin@gmail.com>
Date: Sun, 14 Apr 2024 17:14:36 +0200
Subject: [PATCH] chore: resolve conflicts

---
 src/client/theme-default/components/VPNavBar.vue | 5 ++---
 src/client/theme-default/composables/sidebar.ts  | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/client/theme-default/components/VPNavBar.vue b/src/client/theme-default/components/VPNavBar.vue
index 5dd85e4c..ce610bf3 100644
--- a/src/client/theme-default/components/VPNavBar.vue
+++ b/src/client/theme-default/components/VPNavBar.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { useWindowScroll } from '@vueuse/core'
-import { computed, onMounted, ref, watchPostEffect } from 'vue'
+import { ref, watchPostEffect } from 'vue'
 import { useData } from '../composables/data'
-import { useLocalNav } from '../composables/local-nav'
 import { useSidebar } from '../composables/sidebar'
 import VPNavBarAppearance from './VPNavBarAppearance.vue'
 import VPNavBarExtra from './VPNavBarExtra.vue'
@@ -23,7 +22,7 @@ defineEmits<{
 
 const { y } = useWindowScroll()
 const { hasSidebar } = useSidebar()
-const { hasLocalNav } = useLocalNav()
+// const { hasLocalNav } = useLocalNav()
 const { frontmatter } = useData()
 const navbar = ref<HTMLElement>()
 
diff --git a/src/client/theme-default/composables/sidebar.ts b/src/client/theme-default/composables/sidebar.ts
index 4c604f91..9e7dd485 100644
--- a/src/client/theme-default/composables/sidebar.ts
+++ b/src/client/theme-default/composables/sidebar.ts
@@ -18,7 +18,6 @@ import {
   getSidebarGroups
 } from '../support/sidebar'
 import { useData } from './data'
-import { hashRef } from './hash'
 import { inertControls } from './inert'
 
 export interface SidebarControl {