From dc475cceabba7fceb3e53a8021cd9799b46b7d4b Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Mon, 11 Dec 2017 13:29:33 -0300
Subject: [PATCH] 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>
---
 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 3e6c65b05a..8890867206 100644
--- 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">
-- 
2.20.1