https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14715 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Status|Needs Signoff |Patch doesn't apply --- Comment #33 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Patch doesn't apply anymore, but this sounds like an interesting feature. Can someone rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14715: results per page setting for catalog search Using index info to reconstruct a base tree... M C4/Search.pm M catalogue/search.pl M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt M opac/opac-search.pl Falling back to patching base and 3-way merge... Auto-merging opac/opac-search.pl CONFLICT (content): Merge conflict in opac/opac-search.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Auto-merging catalogue/search.pl CONFLICT (content): Merge conflict in catalogue/search.pl Auto-merging C4/Search.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 14715: results per page setting for catalog search The copy of the patch that failed is found in: .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/Bug-14715-results-per-page-setting-for-catalog-sea-nZTnir.patch -- You are receiving this mail because: You are watching all bug changes.