https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38936 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #16 from David Nind <david@davidnind.com> --- The patch no longer applies: git bz apply 28478 Bug 28478 - MARC detail and ISBD pages still show suppressed records 176898 - Bug 28478: Add get_opac_suppression extractor 176899 - Bug 28478: Add Koha::Biblio->opac_suppressed() 176900 - Bug 28478: Make opac-*detail.pl scripts use Koha::Biblio->opac_suppressed() Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 28478: Add get_opac_suppression extractor Using index info to reconstruct a base tree... M Koha/Biblio/Metadata/Extractor/MARC.pm M t/db_dependent/Koha/Biblio/Metadata/Extractor/MARC.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Biblio/Metadata/Extractor/MARC.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Biblio/Metadata/Extractor/MARC.t error: Failed to merge in the changes. Patch failed at 0001 Bug 28478: Add get_opac_suppression extractor -- You are receiving this mail because: You are watching all bug changes.