http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9697
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |[email protected] --- Comment #6 from Katrin Fischer <[email protected]> --- Owen, can you please rebase and switch back to signed-off? -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
