https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18260 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |aleisha@catalyst.net.nz --- Comment #2 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Patch was unable to apply: Applying: Bug 18260: Koha::Biblio - Remove GetBiblio Using index info to reconstruct a base tree... M C4/Acquisition.pm M C4/Biblio.pm M C4/ILSDI/Services.pm M C4/ImportBatch.pm M C4/Serials.pm M Koha/REST/V1/Hold.pm M catalogue/imageviewer.pl M catalogue/itemsearch.pl M t/db_dependent/Acquisition.t M tools/batch_delete_records.pl Falling back to patching base and 3-way merge... Auto-merging tools/batch_delete_records.pl CONFLICT (content): Merge conflict in tools/batch_delete_records.pl Auto-merging t/db_dependent/Acquisition.t Auto-merging catalogue/itemsearch.pl Auto-merging catalogue/imageviewer.pl Auto-merging Koha/REST/V1/Hold.pm Auto-merging C4/Serials.pm Auto-merging C4/ImportBatch.pm Auto-merging C4/ILSDI/Services.pm Auto-merging C4/Biblio.pm Auto-merging C4/Acquisition.pm Failed to merge in the changes. Patch failed at 0001 Bug 18260: Koha::Biblio - Remove GetBiblio -- You are receiving this mail because: You are watching all bug changes.