https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16154
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Signed Off |Patch doesn't apply --- Comment #18 from Katrin Fischer <[email protected]> --- Sorry, patches no longer apply cleanly, can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 16154: CGI->multi_param - Declare a list Applying: Bug 16154: CGI->multi_param - Manual changes Applying: Bug 16154: CGI->multi_param - Force scalar context fatal: sha1 information is lacking or useless (admin/patron-attr-types.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 16154: CGI->multi_param - Force scalar context The copy of the patch that failed is found in: /home/katrin/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/SIGNED-OFF-Bug-16154-CGI-multiparam---Force-scalar-CQshm9.patch -- 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/
