https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=36455
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Signed Off |Patch doesn't apply --- Comment #18 from David Nind <[email protected]> --- The patch no longer applies 8-(.. I was going to add my sign-off, so that one of the others could count as QA. git bz apply 36455 Bug 36455 - Default the hold queue link to your logged in library 180796 - Bug 36455: Default the hold queue link to your logged in library 180797 - Bug 36455: (follow-up) Default the hold queue link to your logged in library 180798 - Bug 36455: (follow-up) Changed html filters to uri Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 36455: Default the hold queue link to your logged in library Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 36455: Default the hold queue link to your logged in library -- 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/
