http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8462
Nicole C. Engard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #7 from Nicole C. Engard <[email protected]> --- I would like to sign off on this because this is confusing. But the patch doesn't apply: Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Bug 8462: OpacHiddenItems and hidelostitems hide items, but query result count is off Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Search.pm CONFLICT (content): Merge conflict in C4/Search.pm Failed to merge in the changes. Patch failed at 0001 Bug 8462: OpacHiddenItems and hidelostitems hide items, but query result count is off 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". nengard@kohavm:~/kohaclone$ -- 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/
