From ccf25eb5ab5ea8217f61c8946f54bfea64a98304 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Mon, 14 Jan 2019 12:25:34 -0500
Subject: [PATCH] Bug 17047 [QA Followup] - Fixes to make unit tests pass

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 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(-)

diff --git a/Koha/Subscription/Frequency.pm b/Koha/Subscription/Frequency.pm
index d7d06dc3c0..64dd327861 100644
--- a/Koha/Subscription/Frequency.pm
+++ b/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
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc
index 5ec88b8025..fca1b12e3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc
+++ b/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 %]
 
 <script type="text/javascript">
 //<![CDATA[
diff --git a/t/db_dependent/Koha/Subscription.t b/t/db_dependent/Koha/Subscription.t
index fadaae71bb..926bdc198c 100644
--- a/t/db_dependent/Koha/Subscription.t
+++ b/t/db_dependent/Koha/Subscription.t
@@ -32,6 +32,8 @@ use t::lib::TestBuilder;
 my $schema = Koha::Database->new->schema;
 $schema->storage->txn_begin;
 
+my $builder     = t::lib::TestBuilder->new;
+
 use_ok('Koha::Subscription');
 
 subtest 'Koha::Subscription->biblio' => sub {
-- 
2.17.2 (Apple Git-113)