https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18618 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |david@davidnind.com --- Comment #15 from David Nind <david@davidnind.com> --- Patch no longer applies 8-(.. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 18618: Mana - Add scripts to send readings Applying: Bug 18618: Mana - Add reading suggestion Using index info to reconstruct a base tree... M Koha/Biblio.pm M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt Auto-merging Koha/Biblio.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 18618: Mana - Add reading suggestion -- You are receiving this mail because: You are watching all bug changes.