Attachment 69694 Details for Bug 16735 – Bug 16735: (QA followup) Fix rebase error

[patch] Bug 16735: (QA followup) Fix rebase error

Bug-16735-QA-followup-Fix-rebase-error.patch (text/plain), 1.58 KB, created by Tomás Cohen Arazi (tcohen) on 2017-12-11 16:29:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2017-12-11 16:29:54 UTC

Size: 1.58 KB

patch

obsolete

>From 4549eb811f22abc3dcb66ecdf1afc715bdeeac7f 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 followup) Fix rebase error
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> 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({
>                     <th>Name</th>
>                     <th>Code</th>
>                     <th>Address</th>
>-                    <th>Properties</th>
>                     <th>MARC organization code</th>
>                     <th>IP</th>
>                     <th>Actions</th>
>@@ -255,11 +254,6 @@ tinyMCE.init({
>                             [% 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.14.1

Actions: View | Diff | Splinter Review

Attachments on bug 16735: 52732 | 52733 | 52734 | 52735 | 57098 | 57099 | 57100 | 57101 | 58087 | 58088 | 58089 | 58090 | 60497 | 60498 | 60499 | 60500 | 60501 | 60502 | 60503 | 60772 | 60773 | 60774 | 60775 | 60776 | 60777 | 60778 | 60779 | 65658 | 65659 | 65660 | 65661 | 65662 | 65663 | 65664 | 65665 | 69533 | 69534 | 69535 | 69536 | 69537 | 69538 | 69539 | 69540 | 69541 | 69684 | 69685 | 69686 | 69687 | 69688 | 69689 | 69690 | 69691 | 69692 | 69693 | 69694 | 71386 | 71393