From 4549eb811f22abc3dcb66ecdf1afc715bdeeac7f Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 11 Dec 2017 13:29:33 -0300 Subject: [PATCH] Bug 16735: (QA followup) Fix rebase error Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index 194242ea52..82a0a2ee76 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -217,7 +217,6 @@ tinyMCE.init({ Name Code Address - Properties MARC organization code IP Actions @@ -255,11 +254,6 @@ tinyMCE.init({ [% IF library.branchnotes %]
Notes: [% library.branchnotes |html %][% END %] - - [% FOREACH category IN library.get_categories %] - [% category.categoryname |html %]
- [% END %] - [% library.marcorgcode %] [% library.branchip %] -- 2.14.1