From c5264a49495ac9db5bb6c684a2899fa4122ba888 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Thu, 6 Sep 2018 12:24:03 +0100 Subject: [PATCH] Bug 20600: (follow-up) Fix bad rebase Rebasing didn't do the right thing, so this patch fixes it Signed-off-by: Owen Leonard --- .../prog/en/modules/ill/ill-requests.tt | 487 +-------------------- 1 file changed, 2 insertions(+), 485 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index d6c7590..f103fb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -7,491 +7,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › ILL requests [% INCLUDE 'doc-head-close.inc' %] -[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] [% Asset.css("css/datatables.css") | $raw %] -[% INCLUDE 'datatables.inc' %] -[% INCLUDE 'calendar.inc' %] - @@ -899,6 +415,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'calendar.inc' %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]