http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10096
--- Comment #16 from David Cook <[email protected]> --- (In reply to Katrin Fischer from comment #15) > David, I am sorry, but the patch doesn't apply any longer, can you please > provide a rebased patch? > > Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y > Applying: Bug 10096 [FOLLOW-UP] - Add a z39.50 interface for authority > searching > fatal: sha1 information is lacking or useless > (koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. Alas, I think that's Mason's follow-up, so he'll need to provide the rebased version. I can rebase my original, but it would be unfortunate to have to lose/redo his follow-ups. -- 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/
