@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt | 5 ----- 1 file changed, 5 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -233,15 +233,10 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] -<<<<<<< HEAD [% Asset.js("js/admin-menu.js") | $raw %]