From 884bf7880b348ea96a76547a5b7215308a0b5a33 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 3 May 2023 08:46:58 +0200 Subject: [PATCH] Bug 33648: (bug 32991 follow-up) fix bad resolution conflict Wrong resolution conflict on AgreementsList.vue in commit Bug 32991: Improve our Dialog component in master logged_in_user, + setWarning, + setMessage, in 22.11.x + logged_in_user, + setWarning, + setMessage, --- .../intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue index b6e36620f32..7bec5c2c6aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue @@ -59,7 +59,6 @@ export default { get_lib_from_av, map_av_dt_filter, table_id, - logged_in_user, setConfirmationDialog, setMessage, } -- 2.25.1