Skip to content

Commit

Permalink
chore: resolved conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
shariquerik authored Nov 11, 2024
1 parent bfc6f11 commit 06ccd7b
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion frontend/src/components/Layouts/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@ import SidebarLink from '@/components/SidebarLink.vue'
import Notifications from '@/components/Notifications.vue'
import Settings from '@/components/Settings/Settings.vue'
import { viewsStore } from '@/stores/views'
import { notificationsStore } from '@/stores/notifications'
import {
unreadNotificationsCount,
notificationsStore,
} from '@/stores/notifications'
import { showSettings, activeSettingsPage } from '@/composables/settings'
import { FeatherIcon, TrialBanner } from 'frappe-ui'
import { useStorage } from '@vueuse/core'
Expand Down

0 comments on commit 06ccd7b

Please sign in to comment.