[Koha-bugs] [Bug 21280] Unify MARC tab HTML generation

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21280

Michal Denar <black23 at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |black23 at gmail.com

--- Comment #2 from Michal Denar <black23 at gmail.com> ---
Hi,
I get error:
Applying: Bug 21280: Unify MARC tab HTML generation
Using index info to reconstruct a base tree...
M       authorities/detail.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
Falling back to patching base and 3-way merge...
error: The following untracked working tree files would be overwritten by
merge:
        koha-tmpl/intranet-tmpl/prog/en/includes/marc_tab_html.inc

Please, rebase on master.

-- 
You are receiving this mail because:
You are watching all bug changes.