https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24625 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #8 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Can you please rebase? Bug 24625 - Phase out jquery.cookie.js: showLastPatron 105946 - Bug 24625: Store showLastPatron information using localStorage Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24625: Store showLastPatron information using localStorage Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/js/staff-global.js Falling back to patching base and 3-way merge... ^[[AAuto-merging koha-tmpl/intranet-tmpl/prog/js/staff-global.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/staff-global.js -- You are receiving this mail because: You are watching all bug changes.