From afbaf5a860be256c932dc42fa259ffd98a09b247 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 24 Jul 2018 17:35:07 +0000 Subject: [PATCH] Bug 19265: Fix rebase issues (move js to footer) --- .../prog/en/modules/tools/manage-marc-import.tt | 226 +++++---------------- 1 file changed, 46 insertions(+), 180 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt index 8a69bb3..035324e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt @@ -8,177 +8,6 @@ [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/datatables.css") %] - - -[% INCLUDE 'datatables.inc' %] - ->>>>>>> Bug 19265: Rancor - Add export of selected records, edit button to manage imports