https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42189
David Cook <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Patch doesn't apply --- Comment #61 from David Cook <[email protected]> --- Doesn't cleanly apply: diff --cc koha-tmpl/intranet-tmpl/prog/js/vue/modules/islands.ts index f971bf8ee4e,960dbdc8a8f..00000000000 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/islands.ts +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/islands.ts @@@ -2,6 -2,11 +2,14 @@@ import { Component, defineCustomElemen export * from "vue"; import { createPinia } from "pinia"; import { $__ } from "../i18n"; ++<<<<<<< HEAD ++======= + import { useMainStore } from "../stores/main"; + import { useNavigationStore } from "../stores/navigation"; + import { useVendorStore } from "../stores/vendors"; + export { registerWidget, getRegisteredWidgets } from "./widget-registry.ts"; + export { useBaseWidget } from "../composables/base-widget"; ++>>>>>>> Bug 42189: Add widget registry for plugin-provided dashboard widgets /** * Represents a web component with an import function and optional configuration. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list -- [email protected] To unsubscribe send an email to [email protected] website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
