https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38936
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #16 from David Nind <[email protected]> --- 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. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
