@@ -, +, @@ --- Koha/Subscription/Frequency.pm | 4 ---- .../prog/en/includes/mana/mana-report-search-result.inc | 1 + t/db_dependent/Koha/Subscription.t | 2 ++ 3 files changed, 3 insertions(+), 4 deletions(-) --- a/Koha/Subscription/Frequency.pm +++ a/Koha/Subscription/Frequency.pm @@ -25,11 +25,7 @@ use base qw(Koha::Object); =head1 NAME -<<<<<<< b4c9007cc708d995838eae801a5a24b47435095e -Koha::Subscription::Frequency - Koha Subscription Frequency Object class -======= Koha::Subscription::Frequency - Koha Subscription::Frequency Object class ->>>>>>> Bug 17047 subscriptions management with Mana-KB =head1 API --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc @@ -2,6 +2,7 @@ [% USE Koha %] [% USE AuthorisedValues %] [% USE Branches %] +[% USE raw %]