http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13865
Nicole C. Engard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #2 from Nicole C. Engard <[email protected]> --- git15:32 ~/kohaclone (master % u=)$ git qa 13865 >From git://git.koha-community.org/koha * branch master -> FETCH_HEAD Branch bug13865-qa set up to track remote branch master from origin. Switched to a new branch 'bug13865-qa' Bug 13865 - Columns configuration - Orders search 36981 - Bug 13865: Columns configuration - Orders search Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 13865: Columns configuration - Orders search fatal: sha1 information is lacking or useless (admin/columns_settings.yml). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 13865: Columns configuration - Orders search 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/Bug-13865-Columns-configuration---Orders-search-hnC7nE.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/
