https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35560
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #28 from David Nind <[email protected]> --- Not unexpectedly, the patches no longer apply... git bz apply 35560 Bug 35560 - Use the REST API for holds history 165231 - Bug 35560: Use the REST API for holds 165232 - Bug 35560: Add filter on status 165233 - Bug 35560: (follow-up) Add in-page links to jump between tables Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35560: Use the REST API for holds Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 35560: Use the REST API for holds -- 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/
