From f0e29fc46fbc9c6dad7bdd360a067696c930d4cc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 15 Feb 2018 15:20:16 -0300 Subject: [PATCH] Bug 19641: (follow-up) Update circulation.tt too Fix bad merge conflict with bug 18403 Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index b266338ba8..92489bf817 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1009,7 +1009,7 @@ No patron matched [% message | html %] var CATCODE_MULTI = "[% CATCODE_MULTI %]"; var catcode = "[% catcode %]"; var destination = "[% destination %]"; - var CAN_user_borrowers = "[% CAN_user_borrowers %]"; + var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers %]"; columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %] -- 2.39.5