[Koha-bugs] [Bug 29871] Remove marcflavour param in Koha::Biblio->get_marc_notes

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

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

David Nind <david at davidnind.com> changed:

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

--- Comment #3 from David Nind <david at davidnind.com> ---
Patch no longer applies 8-(..

git bz apply 29871

Bug 29871 - Remove marcflavour param in Koha::Biblio->get_marc_notes

129379 - Bug 29871: Remove marcflavour param in Koha::Biblio->get_marc_notes

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 29871: Remove marcflavour param in Koha::Biblio->get_marc_notes
Using index info to reconstruct a base tree...
M       Koha/Biblio.pm
M       basket/basket.pl
M       catalogue/detail.pl
M       opac/opac-basket.pl
M       opac/opac-detail.pl
M       t/db_dependent/Koha/Biblio.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Koha/Biblio.t
Auto-merging opac/opac-detail.pl
Auto-merging opac/opac-basket.pl
Auto-merging catalogue/detail.pl
CONFLICT (content): Merge conflict in catalogue/detail.pl
Auto-merging basket/basket.pl
Auto-merging Koha/Biblio.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29871: Remove marcflavour param in
Koha::Biblio->get_marc_notes

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