From 1966c6be2e21613c5e1efb977dc946f0f1c21e20 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 27 Feb 2019 13:22:31 -0500 Subject: [PATCH] Bug 15774: (follow-up) fix rebase issues Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens --- .../intranet-tmpl/prog/en/modules/admin/additional-fields.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt | 4 ---- serials/serials-search.pl | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt index ad1ebb718d..427dd681c1 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -177,7 +177,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE "datatables.inc" %] -