https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29845 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #5 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- As I can't test Overdrive I am a bit hesitant to try my hands on the rebase: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29845: add IDs to overdrive results action buttons Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js error: Failed to merge in the changes. Patch failed at 0001 Bug 29845: add IDs to overdrive results action buttons -- You are receiving this mail because: You are watching all bug changes.