Bug 16735: (QA follow-up) Fix rebase error

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

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 3e6c65b..8890867 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -178,7 +178,6 @@
                     <th>Name</th>
                     <th>Code</th>
                     <th>Address</th>
-                    <th>Properties</th>
                     <th>MARC organization code</th>
                     <th>IP</th>
                     <th>Actions</th>
@@ -216,11 +215,6 @@
                             [% IF library.branchnotes %]
                                 <br />Notes: [% library.branchnotes |html %][% END %]
                         </td>
-                        <td>
-                            [% FOREACH category IN library.get_categories %]
-                                [% category.categoryname |html %]<br />
-                            [% END %]
-                        </td>
                         <td>[% library.marcorgcode %]</td>
                         <td>[% library.branchip %]</td>
                         <td class="actions">